muhammad fadil
							
						 
					 | 
					
						
						
							
						
						234ae2918f
					 | 
					
						
						
							
							Merge branch 'master' into 'devops-production'
						
						
						
						
						
						
						
						Master
See merge request empatnusabangsa/ppob/ppob-backend!182 
						
						
					 | 
					
						2022-06-21 17:24:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								muhammad fadil
							
						 
					 | 
					
						
						
							
						
						a972e1e570
					 | 
					
						
						
							
							Merge branch 'development' into 'master'
						
						
						
						
						
						
						
						Development
See merge request empatnusabangsa/ppob/ppob-backend!181 
						
						
					 | 
					
						2022-06-21 17:16:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						7aee976de6
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development
						
						
						
						
						
						
					 | 
					
						2022-06-21 20:09:29 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						e36d79d091
					 | 
					
						
						
							
							fix: callback ppob
						
						
						
						
						
						
					 | 
					
						2022-06-21 20:09:15 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						b493b33f30
					 | 
					
						
						
							
							Feat: add relation to partner
						
						
						
						
						
						
					 | 
					
						2022-06-20 13:27:51 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						2ca165f8d9
					 | 
					
						
						
							
							fix: callback ppob
						
						
						
						
						
						
					 | 
					
						2022-06-16 14:46:09 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						bddfc18a31
					 | 
					
						
						
							
							fix: callback ppob
						
						
						
						
						
						
					 | 
					
						2022-06-16 14:37:48 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						1aa61bfe36
					 | 
					
						
						
							
							Fix: bug filter get product by categories
						
						
						
						
						
						
					 | 
					
						2022-05-25 11:30:08 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						9e177679a8
					 | 
					
						
						
							
							Fix: bug filter get product by categories
						
						
						
						
						
						
					 | 
					
						2022-05-24 22:33:14 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						1050ca4c85
					 | 
					
						
						
							
							Feat: add rumus prepaid and postpaid
						
						
						
						
						
						
					 | 
					
						2022-05-24 20:24:42 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						cb7d6833aa
					 | 
					
						
						
							
							fix: callback failed on bill
						
						
						
						
						
						
					 | 
					
						2022-05-24 00:51:24 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						2daf62b3df
					 | 
					
						
						
							
							fix: transaction
						
						
						
						
						
						
					 | 
					
						2022-05-24 00:47:02 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						6f29457720
					 | 
					
						
						
							
							fix: ppob callback
						
						
						
						
						
						
					 | 
					
						2022-05-24 00:42:58 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						c26294ac50
					 | 
					
						
						
							
							fix: ppob callback
						
						
						
						
						
						
					 | 
					
						2022-05-24 00:34:17 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						d2deb841f9
					 | 
					
						
						
							
							Feat: add column admin_price
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:31:23 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						0934147c51
					 | 
					
						
						
							
							Feat: add column partner_fee
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:20:46 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						044a5082e1
					 | 
					
						
						
							
							fixing: callback transaction
						
						
						
						
						
						
					 | 
					
						2022-05-21 19:40:47 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						b33fa4c9c6
					 | 
					
						
						
							
							fixing: callback transaction
						
						
						
						
						
						
					 | 
					
						2022-05-21 18:32:56 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						5f0512e3ce
					 | 
					
						
						
							
							fixing: callback transaction
						
						
						
						
						
						
					 | 
					
						2022-05-21 15:21:05 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						e386f5c618
					 | 
					
						
						
							
							fixing: callback transaction
						
						
						
						
						
						
					 | 
					
						2022-05-21 15:20:54 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						fd47c34453
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development
						
						
						
						
						
						
						
						# Conflicts:
#	src/transaction/transaction.service.ts 
						
						
					 | 
					
						2022-05-21 14:38:21 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						6629e97c35
					 | 
					
						
						
							
							fixing: callback transaction
						
						
						
						
						
						
					 | 
					
						2022-05-21 14:35:59 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						f97095b740
					 | 
					
						
						
							
							Feat add get by id check bill history
						
						
						
						
						
						
					 | 
					
						2022-05-19 19:27:25 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						6a2c535414
					 | 
					
						
						
							
							fixing: transaction bill
						
						
						
						
						
						
					 | 
					
						2022-05-18 22:23:09 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						fe3404db32
					 | 
					
						
						
							
							fixing: product transaction
						
						
						
						
						
						
					 | 
					
						2022-05-17 15:59:15 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						f66f071a3c
					 | 
					
						
						
							
							fixing: check bill
						
						
						
						
						
						
					 | 
					
						2022-05-17 14:48:06 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						f449299bbf
					 | 
					
						
						
							
							fixing: check bill
						
						
						
						
						
						
					 | 
					
						2022-05-17 12:52:02 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						9ee5b65dfc
					 | 
					
						
						
							
							fixing: check bill
						
						
						
						
						
						
					 | 
					
						2022-05-17 12:26:25 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f0d80f118
					 | 
					
						
						
							
							feat: add column check bill
						
						
						
						
						
						
					 | 
					
						2022-05-16 15:06:23 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6bc9c72df8
					 | 
					
						
						
							
							feat: add column check bill
						
						
						
						
						
						
					 | 
					
						2022-05-16 15:05:03 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						feda138732
					 | 
					
						
						
							
							fixing: ppob
						
						
						
						
						
						
					 | 
					
						2022-05-16 14:12:08 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						aae7005914
					 | 
					
						
						
							
							fix: callback
						
						
						
						
						
						
					 | 
					
						2022-05-13 00:44:28 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						5542ed2d4b
					 | 
					
						
						
							
							fix: admin price
						
						
						
						
						
						
					 | 
					
						2022-05-13 00:39:08 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						9bdda9e8bf
					 | 
					
						
						
							
							fix: callback
						
						
						
						
						
						
					 | 
					
						2022-05-13 00:27:15 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						284ae2416b
					 | 
					
						
						
							
							Feat add column admin_price at table product history price
						
						
						
						
						
						
					 | 
					
						2022-05-11 16:57:08 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						892ec58c6a
					 | 
					
						
						
							
							Fix: filter sub categories
						
						
						
						
						
						
					 | 
					
						2022-05-09 17:29:23 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						819c59f28f
					 | 
					
						
						
							
							fix: product in partner
						
						
						
						
						
						
					 | 
					
						2022-05-08 22:42:22 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						137ca8e6f3
					 | 
					
						
						
							
							fix: check bill
						
						
						
						
						
						
					 | 
					
						2022-05-05 18:20:15 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						52839223e6
					 | 
					
						
						
							
							add: transaction billing
						
						
						
						
						
						
					 | 
					
						2022-05-03 19:09:12 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						49e22932b6
					 | 
					
						
						
							
							add: check bill
						
						
						
						
						
						
					 | 
					
						2022-04-29 15:50:16 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						4685797ad4
					 | 
					
						
						
							
							fix: callback metro
						
						
						
						
						
						
					 | 
					
						2022-04-28 17:46:45 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fadli
							
						 
					 | 
					
						
						
							
						
						06f12b0140
					 | 
					
						
						
							
							add : Add supplier: Metro, logic for the callback
						
						
						
						
						
						
					 | 
					
						2022-04-28 17:26:56 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mfadiln2018
							
						 
					 | 
					
						
						
							
						
						3ff8193949
					 | 
					
						
						
							
							Feat: add validation error if id partner is null
						
						
						
						
						
						
					 | 
					
						2022-04-26 12:19:26 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						a1f689e82b
					 | 
					
						
						
							
							add: new partner
						
						
						
						
						
						
					 | 
					
						2022-04-14 14:06:13 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham
							
						 
					 | 
					
						
						
							
						
						b87c444ae6
					 | 
					
						
						
							
							add: new partner
						
						
						
						
						
						
					 | 
					
						2022-04-14 13:21:35 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						790c0902a6
					 | 
					
						
						
							
							add column in table supplier
						
						
						
						
						
						
					 | 
					
						2022-04-02 01:34:11 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cdf9a19816
					 | 
					
						
						
							
							add column url in table supplier
						
						
						
						
						
						
					 | 
					
						2022-04-01 18:17:38 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b05404eb23
					 | 
					
						
						
							
							add column url in table supplier
						
						
						
						
						
						
					 | 
					
						2022-04-01 17:50:22 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2eac1c99e2
					 | 
					
						
						
							
							add column url in table supplier
						
						
						
						
						
						
					 | 
					
						2022-04-01 15:49:27 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ilham dwi pratama
							
						 
					 | 
					
						
						
							
						
						247e994540
					 | 
					
						
						
							
							Merge branch 'development' into 'devops-production'
						
						
						
						
						
						
						
						add: order by in product retail
See merge request empatnusabangsa/ppob/ppob-backend!141 
						
						
					 | 
					
						2022-03-10 17:26:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |