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 | 
						
					
				
					
						
							
							
								
								 truongvo
							
						 | 
						
							
							
							
							
							
								
							
							
								74277cc390
								
							
						 | 
						
							
							
								
								Merge pull request 'setup-holiday-supplier-tool' (#123) from setup-holiday-supplier-tool into master
							
							
							
							
							
							
							
							Reviewed-on: #123 
							
						 | 
						
							2023-01-10 08:03:36 +00:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								8d20189418
								
							
						 | 
						
							
							
								
								Merge pull request 'add get-detail-supplier-info' (#124) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #124 
							
						 | 
						
							2023-01-10 04:28:06 +00:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								39614ca4c5
								
							
						 | 
						
							
							
								
								add get-detail-supplier-info
							
							
							
							
							
						 | 
						
							2023-01-10 11:27:36 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								27d387fd43
								
							
						 | 
						
							
							
								
								Merge branch 'supplier-setup-product' into develop
							
							
							
							
							
						 | 
						
							2023-01-09 16:10:50 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								1edc683dd5
								
							
						 | 
						
							
							
								
								add subject process product req
							
							
							
							
							
						 | 
						
							2023-01-09 15:56:46 +07:00 | 
						
					
				
					
						
							
							
								 
								tuanngo
							
						 | 
						
							
							
							
							
							
								
							
							
								de9c3c1723
								
							
						 | 
						
							
							
								
								Merge pull request 'feature/get-info-supplier-campaign-app' (#122) from feature/get-info-supplier-campaign-app into develop
							
							
							
							
							
							
							
							Reviewed-on: #122 
							
						 | 
						
							2023-01-03 02:24:01 +00:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								e4436002e8
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2023-01-03 09:23:34 +07:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								6ed64beecb
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2023-01-03 09:21:06 +07:00 | 
						
					
				
					
						
							
							
								 
								tuanngo
							
						 | 
						
							
							
							
							
							
								
							
							
								a8f5bf5d6c
								
							
						 | 
						
							
							
								
								Merge pull request 'add response' (#121) from feature/get-info-supplier-campaign-app into develop
							
							
							
							
							
							
							
							Reviewed-on: #121 
							
						 | 
						
							2023-01-03 02:15:06 +00:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								cdccf31571
								
							
						 | 
						
							
							
								
								add response
							
							
							
							
							
						 | 
						
							2023-01-03 09:11:55 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								b0fa596ac2
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2022-12-29 14:13:22 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								9b758ee785
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2022-12-29 14:10:44 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								1d0c2f3aa4
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2022-12-29 13:59:36 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								64c7fca2cc
								
							
						 | 
						
							
							
								
								rename subj
							
							
							
							
							
						 | 
						
							2022-12-29 13:58:16 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								f09f9412fd
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2022-12-29 13:51:37 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								4fd0a89acd
								
							
						 | 
						
							
							
								
								edit check token supplier user
							
							
							
							
							
						 | 
						
							2022-12-29 13:49:04 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								e7888e2c4c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of git.selly.red:Selly-Modules/natsio into supplier-setup-product
							
							
							
							
							
						 | 
						
							2022-12-29 10:02:35 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								082fac0a6a
								
							
						 | 
						
							
							
								
								Merge pull request 'change res check-token-supllier' (#118) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #118 
							
						 | 
						
							2022-12-27 16:49:59 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								ec9dedad0d
								
							
						 | 
						
							
							
								
								change res check-token-supllier
							
							
							
							
							
						 | 
						
							2022-12-27 23:49:25 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								903da5338c
								
							
						 | 
						
							
							
								
								Merge pull request 'fix' (#117) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #117 
							
						 | 
						
							2022-12-27 09:38:19 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								7f548f0931
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2022-12-27 16:37:48 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								8326c478e1
								
							
						 | 
						
							
							
								
								Merge pull request 'edit requestPayload check token supplier' (#116) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #116 
							
						 | 
						
							2022-12-27 09:18:00 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								71be64db27
								
							
						 | 
						
							
							
								
								edit requestPayload check token supplier
							
							
							
							
							
						 | 
						
							2022-12-27 16:16:08 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								e8eddbbc82
								
							
						 | 
						
							
							
								
								Merge branch 'supplier-setup-product' into develop
							
							
							
							
							
						 | 
						
							2022-12-26 15:36:09 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								252c82f1e4
								
							
						 | 
						
							
							
								
								add client queue
							
							
							
							
							
						 | 
						
							2022-12-26 15:16:46 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								dcf44fa87b
								
							
						 | 
						
							
							
								
								Merge branch 'supplier-setup-product' into develop
							
							
							
							
							
						 | 
						
							2022-12-26 15:13:38 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								e66596baf6
								
							
						 | 
						
							
							
								
								define nats queue
							
							
							
							
							
						 | 
						
							2022-12-26 15:12:48 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								b19fea04c8
								
							
						 | 
						
							
							
								
								define nats product
							
							
							
							
							
						 | 
						
							2022-12-26 14:08:14 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								024186d17b
								
							
						 | 
						
							
							
								
								Merge pull request 'edit response checkTokenSupplier' (#115) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #115 
							
						 | 
						
							2022-12-24 06:52:13 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								54f5c45488
								
							
						 | 
						
							
							
								
								edit response checkTokenSupplier
							
							
							
							
							
						 | 
						
							2022-12-24 13:50:58 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								92cdded017
								
							
						 | 
						
							
							
								
								Merge pull request 'add field permission checkTokenSupplier' (#114) from setup-holiday-supplier-tool into develop
							
							
							
							
							
							
							
							Reviewed-on: #114 
							
						 | 
						
							2022-12-23 08:19:09 +00:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								b5d7425114
								
							
						 | 
						
							
							
								
								add field permission checkTokenSupplier
							
							
							
							
							
						 | 
						
							2022-12-23 15:13:35 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								c336e034f8
								
							
						 | 
						
							
							
								
								fix conflix
							
							
							
							
							
						 | 
						
							2022-12-23 14:52:00 +07:00 |