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
							
						 | 
						
							
							
							
							
							
								
							
							
								25890d58bc
								
							
						 | 
						
							
							
								
								merge branch master into 'admin-push-notification-supplier
							
							
							
							
							
						 | 
						
							2022-11-28 10:31:05 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								9d7ebe2ef0
								
							
						 | 
						
							
							
								
								Merge branch 'admin-push-notification-supplier' into develop
							
							
							
							
							
						 | 
						
							2022-11-24 09:40:11 +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 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								0dd3dce224
								
							
						 | 
						
							
							
								
								add nats staff
							
							
							
							
							
						 | 
						
							2022-11-22 10:04:40 +07:00 | 
						
					
				
					
						
							
							
								 
								phuanbui
							
						 | 
						
							
							
							
							
							
								
							
							
								913c762897
								
							
						 | 
						
							
							
								
								Merge pull request 'add get segment info' (#70) from feaure/staff-getinfo into develop
							
							
							
							
							
							
							
							Reviewed-on: #70 
							
						 | 
						
							2022-11-21 22:44:59 +00:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								2719017b61
								
							
						 | 
						
							
							
								
								add cmt
							
							
							
							
							
						 | 
						
							2022-11-22 05:44:36 +07:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1c76bb88
								
							
						 | 
						
							
							
								
								add get segment info
							
							
							
							
							
						 | 
						
							2022-11-22 05:43:02 +07:00 | 
						
					
				
					
						
							
							
								 
								thaingocquang
							
						 | 
						
							
							
							
							
							
								
							
							
								4d19b6d7cf
								
							
						 | 
						
							
							
								
								Merge branch 'refactor-location' into develop
							
							
							
							
							
						 | 
						
							2022-11-21 16:20:33 +07:00 | 
						
					
				
					
						
							
							
								 
								thaingocquang
							
						 | 
						
							
							
							
							
							
								
							
							
								e3599d1903
								
							
						 | 
						
							
							
								
								[location] update location subject
							
							
							
							
							
						 | 
						
							2022-11-21 16:20:06 +07:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								2199bb4eef
								
							
						 | 
						
							
							
								
								fix get list staff
							
							
							
							
							
						 | 
						
							2022-11-18 21:49:42 +07:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								0a9381065f
								
							
						 | 
						
							
							
								
								edit get staff-info
							
							
							
							
							
						 | 
						
							2022-11-18 17:47:26 +07:00 | 
						
					
				
					
						
							
							
								 
								anbuiselly
							
						 | 
						
							
							
							
							
							
								
							
							
								8cceae74ef
								
							
						 | 
						
							
							
								
								get staff by notification action
							
							
							
							
							
						 | 
						
							2022-11-18 16:22:17 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								17dace7edf
								
							
						 | 
						
							
							
								
								remove err method email
							
							
							
							
							
						 | 
						
							2022-11-18 10:24:06 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								23df6da6bf
								
							
						 | 
						
							
							
								
								Merge branch 'admin-push-notification-supplier' into develop
							
							
							
							
							
						 | 
						
							2022-11-18 10:14:21 +07:00 | 
						
					
				
					
						
							
							
								 
								Sinh
							
						 | 
						
							
							
							
							
							
								
							
							
								d45da3e74c
								
							
						 | 
						
							
							
								
								nats - get supplier from old server
							
							
							
							
							
						 | 
						
							2022-11-18 10:13:41 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								d293fb7412
								
							
						 | 
						
							
							
								
								Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
							
							
							
							
							
						 | 
						
							2022-11-17 13:56:08 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								035fb59f64
								
							
						 | 
						
							
							
								
								build email
							
							
							
							
							
						 | 
						
							2022-11-17 13:55:44 +07:00 | 
						
					
				
					
						
							
							
								
									
								
								 Minh Nguyen
							
						 | 
						
							
							
							
							
							
								
							
							
								d10f445bf2
								
							
						 | 
						
							
							
								
								Merge pull request 'feature/campaign' (#62) from feature/campaign into develop
							
							
							
							
							
							
							
							Reviewed-on: #62 
							
						 | 
						
							2022-11-17 02:33:10 +00:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								b8f10912c1
								
							
						 | 
						
							
							
								
								rename
							
							
							
							
							
						 | 
						
							2022-11-17 09:27:45 +07:00 | 
						
					
				
					
						
							
							
								
									
								
								 Minh Nguyen
							
						 | 
						
							
							
							
							
							
								
							
							
								d04712a560
								
							
						 | 
						
							
							
								
								Merge pull request 'feature/campaign' (#58) from feature/campaign into develop
							
							
							
							
							
							
							
							Reviewed-on: #58 
							
						 | 
						
							2022-11-16 10:23:51 +00:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								6e21f72ac0
								
							
						 | 
						
							
							
								
								fix name func
							
							
							
							
							
						 | 
						
							2022-11-16 17:21:37 +07:00 | 
						
					
				
					
						
							
							
								 
								tuannt20
							
						 | 
						
							
							
							
							
							
								
							
							
								7a213f4b4d
								
							
						 | 
						
							
							
								
								nats model campaign admin
							
							
							
							
							
						 | 
						
							2022-11-16 16:43:17 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								44e7cca0d7
								
							
						 | 
						
							
							
								
								Merge branch 'feature/campaign' into develop
							
							
							
							
							
						 | 
						
							2022-11-14 15:11:18 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								18f4444156
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2022-11-14 15:11:04 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								3e1dcb2fe1
								
							
						 | 
						
							
							
								
								fix conflict
							
							
							
							
							
						 | 
						
							2022-11-14 14:47:20 +07:00 | 
						
					
				
					
						
							
							
								 
								Nguyen Minh
							
						 | 
						
							
							
							
							
							
								
							
							
								598c886aa6
								
							
						 | 
						
							
							
								
								nats model campaign
							
							
							
							
							
						 | 
						
							2022-11-14 14:45:26 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								87d6bba079
								
							
						 | 
						
							
							
								
								Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
							
							
							
							
							
						 | 
						
							2022-11-09 14:28:29 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								a3206ebdd4
								
							
						 | 
						
							
							
								
								build auth sms
							
							
							
							
							
						 | 
						
							2022-11-09 14:28:10 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								77547914e0
								
							
						 | 
						
							
							
								
								Merge branch 'build-auth-sms' of git.selly.red:Selly-Modules/natsio into develop
							
							
							
							
							
						 | 
						
							2022-11-08 18:05:00 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								3507d17029
								
							
						 | 
						
							
							
								
								build auth sms
							
							
							
							
							
						 | 
						
							2022-11-08 18:02:42 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								2872e4f75b
								
							
						 | 
						
							
							
								
								build auth sms
							
							
							
							
							
						 | 
						
							2022-11-08 14:15:47 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								4d501a437c
								
							
						 | 
						
							
							
								
								build authsms
							
							
							
							
							
						 | 
						
							2022-11-08 13:57:22 +07:00 | 
						
					
				
					
						
							
							
								 
								Tue
							
						 | 
						
							
							
							
							
							
								
							
							
								ffff325e78
								
							
						 | 
						
							
							
								
								build authsms
							
							
							
							
							
						 | 
						
							2022-11-08 13:53:52 +07:00 | 
						
					
				
					
						
							
							
								 
								QuanTT0110
							
						 | 
						
							
							
							
							
							
								
							
							
								dc33b5ac71
								
							
						 | 
						
							
							
								
								sync data warehouse into service supplier
							
							
							
							
							
						 | 
						
							2022-11-08 11:12:02 +07:00 | 
						
					
				
					
						
							
							
								 
								QuanTT0110
							
						 | 
						
							
							
							
							
							
								
							
							
								5c3c5b6dcb
								
							
						 | 
						
							
							
								
								sync data warehouse into service supplier
							
							
							
							
							
						 | 
						
							2022-11-08 11:09:35 +07:00 |