Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								2c00022622
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2023-03-23 10:36:07 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								afd6b215d6
								
							
						 | 
						
							
							
								
								reqrep socket
							
							
							
							
							
						 | 
						
							2023-03-23 10:34:58 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								4c328c0858
								
							
						 | 
						
							
							
								
								Merge branch 'master' of git.selly.red:Selly-Modules/natsio into supplier-setup-product
							
							
							
							
							
						 | 
						
							2023-01-31 16:21:24 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								b0fa596ac2
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2022-12-29 14:13:22 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								c336e034f8
								
							
						 | 
						
							
							
								
								fix conflix
							
							
							
							
							
						 | 
						
							2022-12-23 14:52:00 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								daac1da25d
								
							
						 | 
						
							
							
								
								delete suppler-holiday && add checkTokenSupplier
							
							
							
							
							
						 | 
						
							2022-12-23 14:47:09 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								92ce4547a4
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2022-12-23 09:30:44 +07:00 | 
						
					
				
					
						
							
							
								 
								buiphuan0211
							
						 | 
						
							
							
							
							
							
								
							
							
								067db84489
								
							
						 | 
						
							
							
								
								add get,create, update supplier-holiday
							
							
							
							
							
						 | 
						
							2022-12-23 03:32:15 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								25890d58bc
								
							
						 | 
						
							
							
								
								merge branch master into 'admin-push-notification-supplier
							
							
							
							
							
						 | 
						
							2022-11-28 10:31:05 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								5b935df169
								
							
						 | 
						
							
							
								
								fix conflcit
							
							
							
							
							
						 | 
						
							2022-11-24 09:42:31 +07:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								e3e498ed23
								
							
						 | 
						
							
							
								
								add nasts campaign transaction
							
							
							
							
							
						 | 
						
							2022-11-24 09:06:48 +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 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								ec2a6e2d43
								
							
						 | 
						
							
							
								
								build email
							
							
							
							
							
						 | 
						
							2022-11-23 09:53:50 +07:00 |