Commit Graph

1039 Commits

Author SHA1 Message Date
Fadli
a57d3aa37f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 17:52:34 +07:00
Fadli
e67ee94e07 - add design for export xlsx transaction history 2022-12-29 17:52:14 +07:00
Fadli
60cfdffa47 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 16:31:30 +07:00
Fadli
de3ce740f0 - fix total profit b2b 2022-12-29 16:30:58 +07:00
Fadli
51fa6cbfef Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-29 13:18:28 +07:00
Fadli
af797919fd - add excel export for history transaction 2022-12-29 13:17:38 +07:00
Fadli
161ae095ea Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-12-20 11:01:39 +07:00
Fadli
378b566366 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-20 01:40:05 +07:00
Fadli
dbf7fa6af5 fix on proccess check bill doesn't insert on db 2022-12-20 01:39:34 +07:00
Fadli
4955cfb893 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-19 23:00:25 +07:00
Fadli
621de03f32 - add type product in list product b2c 2022-12-19 22:59:39 +07:00
Fadli
251308e5e4 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-12-15 15:40:46 +07:00
Fadli
335cff4202 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-15 15:40:13 +07:00
Fadli
f4e6c5ac3c - push logs send callback 2022-12-15 15:39:38 +07:00
Fadli
0321b6bc98 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-08 16:07:56 +07:00
Fadli
7f412abfa7 - fix order stg 2022-12-08 16:07:37 +07:00
Fadli
4b92b2694f Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-12-08 16:05:22 +07:00
Fadli
f3f22d1beb - fix order stg 2022-12-08 16:04:47 +07:00
Fadli
1e0f1dedc6 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-29 00:02:40 +07:00
Fadli
e38a15ee32 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-29 00:02:15 +07:00
Fadli
8e6fe1b164 - fix error message when balance supplier is not enough 2022-11-29 00:01:54 +07:00
Fadli
4a70f8d763 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-24 22:53:10 +07:00
Fadli
a31c10a608 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-24 22:31:44 +07:00
Fadli
c3c1433197 - fix transaction error in metro 2022-11-24 22:31:04 +07:00
Fadli
ef1f912871 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-22 13:11:55 +07:00
Fadli
0ecf5f9480 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-22 13:11:32 +07:00
Fadli
071dd2f0ef - add id array for transaction 2022-11-22 13:11:11 +07:00
Fadli
d8c9e2be72 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-22 13:07:32 +07:00
Fadli
beaac7e4ad Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-22 13:07:02 +07:00
Fadli
3178c1f4c6 - add id array for transaction 2022-11-22 13:06:23 +07:00
Fadli
e0279c410e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-21 16:35:03 +07:00
Fadli
dfd05013c5 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-21 16:34:38 +07:00
Fadli
47459631ca - fix get product price in transaction 2022-11-21 16:34:10 +07:00
Fadli
0b8ce4967d - fix get product price in transaction 2022-11-21 16:22:34 +07:00
Fadli
f5295bcc4e Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 16:07:39 +07:00
Fadli
aed60a6f30 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 16:07:16 +07:00
Fadli
12bd13fea7 - fix generate id for transaction 2022-11-18 16:06:51 +07:00
Fadli
77b5e52ff9 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 16:02:32 +07:00
Fadli
7eda53cb4c Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 16:01:02 +07:00
Fadli
cf19989ed9 - fix generate id for transaction 2022-11-18 16:00:41 +07:00
Fadli
2d1275651f Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-18 15:40:31 +07:00
Fadli
904e8add9e Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-18 15:39:55 +07:00
Fadli
da2fd4fdf1 - fix generate id for transaction 2022-11-18 15:39:05 +07:00
Fadli
1b53e34683 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 12:29:14 +07:00
Fadli
2f40d9c4a8 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-17 12:28:44 +07:00
Fadli
5da58302fb - fix when response is PLN Quota with user name using space 2022-11-17 12:27:59 +07:00
Fadli
1717554d9d Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 03:11:10 +07:00
Fadli
70fd1e06a7 Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging 2022-11-17 03:10:43 +07:00
Fadli
b46f82f775 - fix when response is PLN Quota with user name using space 2022-11-17 03:10:00 +07:00
Fadli
29def85db0 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend 2022-11-17 02:45:53 +07:00