Commit Graph

818 Commits

Author SHA1 Message Date
Fadli
83594cb0e3 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 11:50:57 +07:00
Fadli
7958231883 - fix total commision query 2022-10-12 11:50:16 +07:00
Fadli
221ec91740 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-12 10:46:53 +07:00
Fadli
6ac60fac2b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:46:28 +07:00
Fadli
1bc5fd08dc Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:46:02 +07:00
Fadli
175fa2a7eb - fix total commision query 2022-10-12 10:45:42 +07:00
Fadli
3c8b9b5481 Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-12 10:44:09 +07:00
Fadli
4253434e0b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:43:39 +07:00
Fadli
44bdfc3916 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:42:10 +07:00
Fadli
9bd6ee6b9b - fix total commision query 2022-10-12 10:41:40 +07:00
Fadli
fbfadede9a Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-12 10:25:45 +07:00
Fadli
ff333173b3 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-12 10:25:21 +07:00
Fadli
76b6ff9888 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:24:53 +07:00
Fadli
16be12ff69 - fix total commision query 2022-10-12 10:24:30 +07:00
Fadli
50c1c08c51 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 10:06:45 +07:00
Fadli
d7bac800e2 - fix total commision query 2022-10-12 10:06:18 +07:00
Fadli
555bad6f27 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 09:59:51 +07:00
Fadli
65ba23c7f6 - fix total commision query 2022-10-12 09:59:20 +07:00
Fadli
7ee95b6da2 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-12 09:53:40 +07:00
Fadli
fdd9802d6c - fix total commision query 2022-10-12 09:53:05 +07:00
Fadli
31486e4392 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-11 11:41:24 +07:00
Fadli
7285938241 - fix total commision 2022-10-11 11:40:54 +07:00
Fadli
37ca28129f Merge branch 'master' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-production 2022-10-11 11:32:43 +07:00
Fadli
e9ac78aa5a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-10-11 11:32:02 +07:00
Fadli
23acd699d4 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-11 11:31:16 +07:00
Fadli
8d1ed5a686 - fix total commision 2022-10-11 11:30:41 +07:00
Fadli
6d75bfaa9b Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-10-10 22:03:25 +07:00
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