Commit Graph

737 Commits

Author SHA1 Message Date
2bd8593459 Merge branch 'main' into 'devops-production'
Main

See merge request empatnusabangsa/ppob/ppob-frontend!193
2023-01-06 05:45:52 +00:00
c43c08ffd6 Merge branch 'devops-staging' into 'main'
Devops staging

See merge request empatnusabangsa/ppob/ppob-frontend!192
2023-01-06 05:42:36 +00:00
2bc17bdcac Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!191
2023-01-06 05:35:24 +00:00
923f788a59 fix: key top up supplier 2023-01-06 12:34:14 +07:00
e3d5d81277 fix: key top up supplier 2023-01-06 11:44:55 +07:00
Fadli
dbae6e03c1 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2023-01-06 11:38:20 +07:00
Fadli
136efb4908 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2023-01-06 11:37:52 +07:00
Fadli
425caac5bf Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2023-01-06 11:37:24 +07:00
Fadli
602831912f - revert topup button 2023-01-06 11:36:51 +07:00
Fadli
ce73831a87 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2023-01-06 11:32:21 +07:00
Fadli
724ffb198a Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2023-01-06 11:31:43 +07:00
Fadli
e8e39b1bb3 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2023-01-06 11:31:08 +07:00
Fadli
55cc9324be - revert topup button 2023-01-06 11:30:30 +07:00
Fadli
5c66610854 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2023-01-06 03:19:32 +07:00
Fadli
af8162f558 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2023-01-06 03:18:55 +07:00
Fadli
67611aceb2 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2023-01-06 03:18:03 +07:00
f120728365 fix: layout home, value in form top up supplier 2023-01-04 13:38:16 +07:00
Fadli
d85051d164 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2023-01-04 01:18:03 +07:00
Fadli
32d3a0f4fc Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend
 Conflicts:
	yarn.lock
2023-01-04 01:17:23 +07:00
8908d711ec Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!190
2023-01-02 15:09:22 +00:00
b163b62e86 feat: export file 2023-01-02 22:08:03 +07:00
Fadli
aed004fc15 - fix export transaction history data in detail user 2023-01-01 16:59:53 +07:00
08196fdc1d fix: list history top up 2022-12-31 05:00:48 +07:00
Fadli
e315a2d7d7 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2022-12-20 11:03:38 +07:00
Fadli
3b7ccd8214 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2022-12-20 11:03:09 +07:00
Fadli
1563ace937 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-12-20 11:00:48 +07:00
Fadli
c957483666 - fix date filter in transaction 2022-12-20 11:00:24 +07:00
Fadli
9a739b0bfa Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-12-20 01:58:16 +07:00
Fadli
384e6b7e0f - fix status check bill when pending in b2c 2022-12-20 01:57:43 +07:00
Fadli
8222552ec5 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-12-20 01:15:32 +07:00
Fadli
3c1a10ee80 - add check bill and postpaid in b2c 2022-12-20 01:14:50 +07:00
Fadli
2668123edb Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2022-12-02 00:53:31 +07:00
Fadli
a43a906a64 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2022-12-02 00:50:10 +07:00
Fadli
33bc456032 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-12-02 00:48:31 +07:00
Fadli
da08b06d4f - Transaction history view: add option 1000 per page
- Change transaction date format from DD/MM/YYYY to MM/DD/YYYY
2022-12-02 00:45:45 +07:00
Fadli
e99b42906e Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2022-09-12 15:44:57 +07:00
Fadli
e593a13990 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2022-09-12 15:44:21 +07:00
Fadli
ada8b1db1a Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-09-12 15:43:47 +07:00
Fadli
9b94ddd76a - fix categories and sub-categories product limit in b2c 2022-09-12 15:43:21 +07:00
Fadli
ec7f052bf4 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2022-09-12 12:43:27 +07:00
Fadli
afe12f249b Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2022-09-12 12:42:30 +07:00
Fadli
7b78e75900 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging 2022-09-07 20:04:02 +07:00
Fadli
bc69bba068 - add productId field in request order-prod and order-stg 2022-09-07 20:03:23 +07:00
756d637d84 Merge branch 'devops-staging' into 'devops-production'
Devops staging

See merge request empatnusabangsa/ppob/ppob-frontend!189
2022-08-30 08:36:03 +00:00
61e3c2a30a Merge branch 'devops-staging' into 'main'
Devops staging

See merge request empatnusabangsa/ppob/ppob-frontend!188
2022-08-30 08:34:49 +00:00
1f8b11bf5b Merge branch 'develop' into 'devops-staging'
feat: fixing status product

See merge request empatnusabangsa/ppob/ppob-frontend!187
2022-08-30 08:31:30 +00:00
435e616241 feat: fixing status product 2022-08-30 15:30:10 +07:00
Fadli
0fe7dc2054 Merge branch 'main' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production 2022-08-15 02:32:05 +07:00
Fadli
7ff83f9463 Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend 2022-08-15 02:31:14 +07:00
a5d6eddb2a Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!186
2022-08-12 11:33:08 +00:00