Commit Graph

593 Commits

Author SHA1 Message Date
Fadli
5c50d1d53a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into development
 Conflicts:
	src/transaction/transaction.service.ts
2022-06-29 18:11:37 +07:00
Fadli
1fcc7ca8ad -add condition for ppob_callback can't hit 2 times if the transaction is already success or failed (only pending) 2022-06-29 18:10:05 +07:00
ilham
fe7702836e fix: rollback 2022-06-29 18:07:07 +07:00
ilham dwi pratama
828b82b7b6 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!190
2022-06-28 10:11:04 +00:00
ilham
104067f263 fix: callbacktransction 2022-06-28 17:10:07 +07:00
ilham dwi pratama
0111600d89 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!189
2022-06-28 10:07:01 +00:00
ilham
5d3b8dbcb4 fix: callbacktransction 2022-06-28 17:06:16 +07:00
ilham dwi pratama
a2af6e7043 Merge branch 'development' into 'devops-staging'
fix: callbacktransction

See merge request empatnusabangsa/ppob/ppob-backend!188
2022-06-28 09:22:50 +00:00
ilham
47bf474a6a fix: callbacktransction 2022-06-28 16:22:01 +07:00
ilham dwi pratama
564166f14f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!186
2022-06-28 08:41:03 +00:00
ilham
359b375556 fix: callbacktransction 2022-06-28 15:40:01 +07:00
ilham
953161c4b2 fix: rollback jurnal 2022-06-28 15:14:51 +07:00
ilham
c2b4b5ec30 fix: rollback jurnal 2022-06-28 14:58:05 +07:00
ilham dwi pratama
62a9690bec Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!184
2022-06-28 06:53:12 +00:00
ilham
4befb8d9fd fix: callback ppob 2022-06-28 13:51:18 +07: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
muhammad fadil
8b8d921c7c Merge branch 'development' into 'devops-staging'
Feat: add relation to partner

See merge request empatnusabangsa/ppob/ppob-backend!180
2022-06-20 06:35:54 +00:00
mfadiln2018
b493b33f30 Feat: add relation to partner 2022-06-20 13:27:51 +07:00
ilham dwi pratama
80e5aa4431 Merge branch 'development' into 'devops-staging'
fix: callback ppob

See merge request empatnusabangsa/ppob/ppob-backend!179
2022-06-16 09:44:14 +00:00
ilham
2ca165f8d9 fix: callback ppob 2022-06-16 14:46:09 +07:00
ilham dwi pratama
c06b40e839 Merge branch 'development' into 'devops-staging'
fix: callback ppob

See merge request empatnusabangsa/ppob/ppob-backend!178
2022-06-16 07:39:46 +00:00
ilham
bddfc18a31 fix: callback ppob 2022-06-16 14:37:48 +07:00
muhammad fadil
929cec7fa9 Merge branch 'development' into 'devops-staging'
Fix: bug filter get product by categories

See merge request empatnusabangsa/ppob/ppob-backend!177
2022-05-25 04:31:54 +00:00
mfadiln2018
1aa61bfe36 Fix: bug filter get product by categories 2022-05-25 11:30:08 +07:00
muhammad fadil
a67be14731 Merge branch 'development' into 'devops-staging'
Fix: bug filter get product by categories

See merge request empatnusabangsa/ppob/ppob-backend!176
2022-05-24 15:49:18 +00:00
mfadiln2018
9e177679a8 Fix: bug filter get product by categories 2022-05-24 22:33:14 +07:00
muhammad fadil
384e40c32f Merge branch 'development' into 'devops-staging'
Feat: add rumus prepaid and postpaid

See merge request empatnusabangsa/ppob/ppob-backend!175
2022-05-24 13:26:11 +00:00
mfadiln2018
1050ca4c85 Feat: add rumus prepaid and postpaid 2022-05-24 20:24:42 +07:00
ilham dwi pratama
a445de1bba Merge branch 'development' into 'devops-staging'
fix: callback failed on bill

See merge request empatnusabangsa/ppob/ppob-backend!174
2022-05-23 18:10:24 +00:00
ilham
cb7d6833aa fix: callback failed on bill 2022-05-24 00:51:24 +07:00
ilham dwi pratama
2fd2f042e9 Merge branch 'development' into 'devops-staging'
fix: transaction

See merge request empatnusabangsa/ppob/ppob-backend!173
2022-05-23 17:47:39 +00:00
ilham
2daf62b3df fix: transaction 2022-05-24 00:47:02 +07:00
ilham dwi pratama
3b4da47eb7 Merge branch 'development' into 'devops-staging'
fix: ppob callback

See merge request empatnusabangsa/ppob/ppob-backend!172
2022-05-23 17:43:33 +00:00
ilham
6f29457720 fix: ppob callback 2022-05-24 00:42:58 +07:00
ilham dwi pratama
772a921058 Merge branch 'development' into 'devops-staging'
fix: ppob callback

See merge request empatnusabangsa/ppob/ppob-backend!171
2022-05-23 17:34:48 +00:00
ilham
c26294ac50 fix: ppob callback 2022-05-24 00:34:17 +07:00
muhammad fadil
12c1aaf5a6 Merge branch 'development' into 'devops-staging'
Feat: add column admin_price

See merge request empatnusabangsa/ppob/ppob-backend!170
2022-05-23 14:33:45 +00:00
mfadiln2018
d2deb841f9 Feat: add column admin_price 2022-05-23 21:31:23 +07:00
muhammad fadil
f8c18522cf Merge branch 'development' into 'devops-staging'
Feat: add column partner_fee

See merge request empatnusabangsa/ppob/ppob-backend!169
2022-05-23 14:22:28 +00:00
mfadiln2018
0934147c51 Feat: add column partner_fee 2022-05-23 21:20:46 +07:00
ilham dwi pratama
4368d0ad8d Merge branch 'development' into 'devops-staging'
fixing: callback transaction

See merge request empatnusabangsa/ppob/ppob-backend!168
2022-05-21 12:41:31 +00:00
ilham
044a5082e1 fixing: callback transaction 2022-05-21 19:40:47 +07:00
ilham dwi pratama
05f77ebf67 Merge branch 'development' into 'devops-staging'
fixing: callback transaction

See merge request empatnusabangsa/ppob/ppob-backend!167
2022-05-21 11:34:01 +00:00
ilham
b33fa4c9c6 fixing: callback transaction 2022-05-21 18:32:56 +07:00
ilham dwi pratama
a7a6290e2c Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!166
2022-05-21 08:21:43 +00: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 dwi pratama
c2988d30a9 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!165
2022-05-21 07:40:03 +00: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