Commit Graph

941 Commits

Author SHA1 Message Date
Fadli
6fe43a6194 - logs total expense 2022-10-10 22:01:46 +07:00
Fadli
67fee748e4 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-10 17:23:15 +07:00
Fadli
842cbe757b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-10 17:22:36 +07:00
Fadli
fed04631db Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 17:21:52 +07:00
Fadli
3369c3aedb - fix when product not active can't order 2022-10-10 17:21:13 +07:00
Fadli
aa1d7fc1e9 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-10 14:46:42 +07:00
Fadli
a2e81f1c53 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-10 14:45:53 +07:00
Fadli
4a293638fe Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 14:44:57 +07:00
Fadli
c47327f524 - fix when product not active can't order 2022-10-10 14:43:52 +07:00
Fadli
21792e981e - add 2 hemat supplier as faktur and non faktur 2022-10-03 11:11:09 +07:00
Fadli
90625c9e5b Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-30 14:07:16 +07:00
Fadli
0f1514e58f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-09-30 14:04:54 +07:00
Fadli
88a73af076 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-09-30 14:04:05 +07:00
Fadli
d598bbb4ab - fix callback if got 2 times in elang 2022-09-30 14:03:16 +07:00
Fadli
903880ed49 - fix check-bill for si hemat 2022-09-28 11:49:08 +07:00
Fadli
634f7946e5 - fix check-bill for si hemat 2022-09-28 00:54:58 +07:00
mfadiln2018
5f8212e5c5 fix: transaction supplier hemat 2022-09-27 14:30:15 +07:00
Fadli
30713bebec Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into development
 Conflicts:
	src/helper/irs-api.ts
	src/transaction/transaction.service.ts
2022-09-26 22:16:47 +07:00
Fadli
a218b949b4 -fix transaction api error 401 for hemat 2022-09-26 22:12:55 +07:00
mfadiln2018
4cf1454c2c fix: post api transaction hemat 2022-09-26 16:04:54 +07:00
Fadli
7cd52a5998 -fix url for login and transaction si hemat 2022-09-26 14:54:41 +07:00
Fadli
45064ee853 -fix url for login and transaction si hemat 2022-09-26 14:38:51 +07:00
Fadli
9b14685a92 add all request for si hemat :
- Login
- Request Transaction PrePaid
- Request Inquiry / Check Bill PostPaid
- Request Payment PostPaid
2022-09-21 18:51:44 +07:00
Fadli
f37575e940 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-09-14 12:23:35 +07:00
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