Fadli
|
e7c8dbf8f5
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-08-05 14:31:49 +07:00 |
|
Fadli
|
433de77ab0
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-05 14:31:00 +07:00 |
|
Fadli
|
109f8f65e2
|
- add auto update price when getting callback metro only for metro
|
2022-08-05 14:30:23 +07:00 |
|
Fadli
|
08730de976
|
Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production
|
2022-08-05 12:53:43 +07:00 |
|
Fadli
|
19541ce796
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-08-05 12:53:04 +07:00 |
|
Fadli
|
b51f77516e
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-05 12:51:53 +07:00 |
|
Fadli
|
9c90c3f1d0
|
- add auto update price when getting callback metro only for metro
|
2022-08-05 12:50:19 +07:00 |
|
Fadli
|
9f2aee624a
|
Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production
|
2022-08-05 11:43:17 +07:00 |
|
Fadli
|
a9d09a40ff
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-08-05 11:42:00 +07:00 |
|
Fadli
|
3396a67709
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-04 18:44:56 +07:00 |
|
Fadli
|
92b71ec274
|
- add auto update price when getting callback metro
|
2022-08-04 18:43:44 +07:00 |
|
Fadli
|
80340618b9
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-04 18:10:08 +07:00 |
|
Fadli
|
ee4314c66e
|
- add auto update price when getting callback metro
|
2022-08-04 18:06:08 +07:00 |
|
Fadli
|
0f24e89bf0
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-03 22:48:41 +07:00 |
|
Fadli
|
245e876144
|
- handle when product is not active cannot hit api transaction order prod
|
2022-08-03 22:47:59 +07:00 |
|
muhammad fadil
|
b4767bae1b
|
Merge branch 'development' into 'devops-staging'
Fix: error callback order failed
See merge request empatnusabangsa/ppob/ppob-backend!192
|
2022-08-03 15:08:46 +00:00 |
|
mfadiln2018
|
c184fdddc5
|
Fix: error callback order failed
|
2022-08-03 22:07:47 +07:00 |
|
Fadli
|
238b7ed576
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-03 19:27:01 +07:00 |
|
Fadli
|
1ef47fc7e7
|
- added logs in ppob callback for metro
|
2022-08-03 19:25:08 +07:00 |
|
Fadli
|
5d2c79cea9
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-08-03 19:01:34 +07:00 |
|
Fadli
|
f8c9e4fcd0
|
- added logs in ppob callback for metro
|
2022-08-03 19:00:52 +07:00 |
|
Fadli
|
ffdf888d24
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-07-23 01:04:45 +07:00 |
|
Fadli
|
929d06331e
|
- handle when product is not active cannot hit api transaction order
|
2022-07-23 01:04:05 +07:00 |
|
Fadli
|
849e5f3cfc
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-07-22 08:58:05 +07:00 |
|
Fadli
|
73d033738a
|
- revert total modal in dashboard
|
2022-07-22 08:57:18 +07:00 |
|
Fadli
|
3913bc8c8a
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-07-22 04:14:33 +07:00 |
|
Fadli
|
43cd745d5e
|
- fix total modal in dashboard admin filter by partner id
|
2022-07-22 04:13:39 +07:00 |
|
Fadli
|
642ac5f749
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-07-22 03:17:47 +07:00 |
|
Fadli
|
67e79280b2
|
- fix total modal in dashboard admin
|
2022-07-22 03:16:52 +07:00 |
|
muhammad fadil
|
caf921b400
|
Merge branch 'development' into 'devops-staging'
Feat: add column supplier_name and product_price at get list history user
See merge request empatnusabangsa/ppob/ppob-backend!191
|
2022-07-18 15:41:53 +00:00 |
|
mfadiln2018
|
f77fae0e16
|
Feat: add column supplier_name and product_price at get list history user
|
2022-07-18 22:39:21 +07:00 |
|
Fadli
|
e8751cf5e8
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production
|
2022-07-01 02:37:23 +07:00 |
|
Fadli
|
9f4ea6bd1a
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-07-01 02:36:35 +07:00 |
|
Fadli
|
cd978afd7d
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-07-01 02:35:38 +07:00 |
|
Fadli
|
e014b70f6c
|
-fix bugs in add condition for ppob_callback can't hit 2 times if the transaction is already success or failed (only pending)
|
2022-07-01 02:29:14 +07:00 |
|
Fadli
|
1d92896b6e
|
Merge branch 'devops-production' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production
|
2022-06-29 23:57:06 +07:00 |
|
Fadli
|
b0a5079feb
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production
|
2022-06-29 23:56:52 +07:00 |
|
Fadli
|
55193f4a5c
|
Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-06-29 23:56:03 +07:00 |
|
Fadli
|
8641929e29
|
Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend
|
2022-06-29 23:55:03 +07:00 |
|
Fadli
|
949e368c2f
|
Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging
|
2022-06-29 23:53:43 +07:00 |
|
Fadli
|
7fe73c0dc4
|
-add condition for ppob_callback can't hit 2 times if the transaction is already success or failed (only pending)
|
2022-06-29 22:46:28 +07:00 |
|
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 |
|