Commit Graph

1017 Commits

Author SHA1 Message Date
Fadli
4ab55f27c5 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-14 12:23:01 +07:00
Fadli
e56b341470 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-14 12:21:56 +07:00
Fadli
a5683666aa - add condition for irs as a supplier 2022-09-14 12:21:06 +07:00
Fadli
d998e90e70 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-14 11:20:37 +07:00
Fadli
558689d487 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-14 11:19:56 +07:00
Fadli
3fa92bee30 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-14 11:19:24 +07:00
Fadli
c8554645cd - push logs partner id when transaction 2022-09-14 11:18:54 +07:00
Fadli
bfb8a2ca66 - push logs partner id when transaction 2022-09-14 11:17:45 +07:00
Fadli
3c7987a52c Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-12 12:40:11 +07:00
Fadli
10dc71887e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-12 12:39:30 +07:00
muhammad fadil
6758b090cc Merge branch 'development' into 'devops-staging'
fix: get list by categories all where partner is null

See merge request empatnusabangsa/ppob/ppob-backend!220
2022-09-07 12:20:32 +00:00
mfadiln2018
a007808535 fix: get list by categories all where partner is null 2022-09-07 19:19:55 +07:00
muhammad fadil
b6a743d006 Merge branch 'development' into 'devops-staging'
fix: get list by categories all where supplier status is true

See merge request empatnusabangsa/ppob/ppob-backend!219
2022-09-07 10:52:31 +00:00
mfadiln2018
dd86a86373 fix: get list by categories all where supplier status is true 2022-09-07 17:50:50 +07:00
muhammad fadil
b454652177 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!218
2022-09-07 10:12:41 +00:00
mfadiln2018
799cd43983 fix: get list by categories all 2022-09-07 17:08:06 +07:00
Fadli
6d9ce6f8ec - fix order-prod and order-stg if suppliers have same code product 2022-09-07 16:36:24 +07:00
Fadli
443328bdb4 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-07 01:27:25 +07:00
Fadli
be4c85d930 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-07 01:26:39 +07:00
Fadli
4ddc2d7d4f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-07 01:26:01 +07:00
Fadli
399c6ff9e4 - revert change for checking if callback already success or failed cannot hit 2 times 2022-09-07 01:25:35 +07:00
Fadli
cebc151667 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-07 00:56:29 +07:00
Fadli
09f9810792 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-07 00:55:58 +07:00
Fadli
f1cedd44bf Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-07 00:55:03 +07:00
mfadiln2018
3342d5044d fix: insert balance remaining 2022-09-06 23:48:30 +07:00
Fadli
775da60bff Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 22:31:00 +07:00
Fadli
8fdd79d0ce Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:30:29 +07:00
Fadli
cdcb1cebc5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:29:56 +07:00
Fadli
e11c6a285b - logs in find all coa by user 2022-09-06 22:29:26 +07:00
Fadli
905205d181 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 22:21:11 +07:00
Fadli
6670352210 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:20:37 +07:00
Fadli
ce8497827a Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:17:52 +07:00
Fadli
42403184b1 - push logs in callback success checking data partneer 2022-09-06 22:17:07 +07:00
Fadli
c2cc6ed71d Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 22:01:25 +07:00
Fadli
57ed270c55 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 22:00:53 +07:00
Fadli
15e4090527 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 22:00:17 +07:00
Fadli
5f5880f4e8 - push logs in callback success checking data partneer 2022-09-06 21:59:50 +07:00
Fadli
917295d60a Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 21:45:00 +07:00
Fadli
6ba62ed85d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 21:44:26 +07:00
Fadli
b7b3c6a6e2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 21:43:56 +07:00
Fadli
880d32b4bc - push logs in callback success checking data partneer 2022-09-06 21:43:27 +07:00
Fadli
fd2cd506f5 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 21:37:47 +07:00
Fadli
d1be6fcef6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 21:37:18 +07:00
Fadli
ee3625531d Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 21:36:39 +07:00
Fadli
9d9772270d - add condition for userdata partner if not null in callback success
- comment check if the transaction is success
2022-09-06 21:36:05 +07:00
muhammad fadil
179669ff47 Merge branch 'development' into 'devops-staging'
fix: get list product by categories

See merge request empatnusabangsa/ppob/ppob-backend!217
2022-09-06 10:16:29 +00:00
mfadiln2018
6a7c66f461 fix: get list product by categories 2022-09-06 16:44:11 +07:00
Fadli
fdc80170c3 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-06 13:27:39 +07:00
Fadli
1ab030a5fd Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-06 13:27:07 +07:00
Fadli
f607b4eccf Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-06 13:25:49 +07:00