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 |
|
|
|
620ba37c79
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop
|
2022-08-12 18:28:47 +07:00 |
|
|
|
8946922b5b
|
feat: add column sisa saldo in admin partner
|
2022-08-12 18:28:38 +07:00 |
|
Fadli
|
9a37e2a65e
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging
|
2022-08-11 00:02:20 +07:00 |
|
Fadli
|
bf7f143315
|
- change field profit produk to mark_up_price
|
2022-08-11 00:01:35 +07:00 |
|
|
|
490676f5df
|
Merge branch 'develop' into 'devops-staging'
feat: add column sisa saldo
See merge request empatnusabangsa/ppob/ppob-frontend!185
|
2022-08-08 07:55:34 +00:00 |
|
|
|
fcbc1640ca
|
feat: add column sisa saldo
|
2022-08-08 14:54:09 +07:00 |
|
|
|
784e4a71f6
|
Merge branch 'main' into 'devops-production'
Revert "fix product filter when page 2 and then filter didn't detect list item < 10"
See merge request empatnusabangsa/ppob/ppob-frontend!184
|
2022-08-05 05:44:54 +00:00 |
|
|
|
37a73aeeeb
|
Merge branch 'devops-staging' into 'main'
Devops staging
See merge request empatnusabangsa/ppob/ppob-frontend!183
|
2022-08-05 05:43:45 +00:00 |
|
|
|
24e4f49b0e
|
Merge branch 'develop' into 'devops-staging'
feat: add column supplier and profit produk in history
See merge request empatnusabangsa/ppob/ppob-frontend!182
|
2022-07-19 07:34:49 +00:00 |
|
|
|
4ff97fa1fd
|
feat: add column supplier and profit produk in history
|
2022-07-19 14:33:39 +07:00 |
|
|
|
e0dac8c405
|
feat: add column supplier and profit produk in history
|
2022-07-19 11:24:50 +07:00 |
|
Fadli
|
2916b53cd6
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend
|
2022-06-22 00:14:05 +07:00 |
|
Fadli
|
70b5bbb8a4
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-production
|
2022-06-22 00:10:18 +07:00 |
|
Fadli
|
bb75451a4e
|
Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging
|
2022-06-21 11:43:10 +07:00 |
|
Fadli
|
e12b530e7d
|
- add code in detail user in role admin
|
2022-06-20 13:53:14 +07:00 |
|
