Commit Graph

652 Commits

Author SHA1 Message Date
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
47b6b3db5e Merge branch 'develop' into 'devops-staging'
fixing wording

See merge request empatnusabangsa/ppob/ppob-frontend!179
2022-05-24 18:25:45 +00:00
166e8ecde5 fixing wording 2022-05-25 01:24:18 +07:00
3b2d4a0cbc Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!178
2022-05-24 14:07:59 +00:00
5fea6f568d feat: create table in profile 2022-05-24 21:06:34 +07:00
c330f65612 feat: wording fee jual in product list 2022-05-24 16:39:54 +07:00
9d9fd7dba6 Merge branch 'develop' into 'devops-staging'
feat: add column partner fee in detail product role admin

See merge request empatnusabangsa/ppob/ppob-frontend!177
2022-05-23 18:00:31 +00:00
cd3d61d5f5 feat: add column partner fee in detail product role admin 2022-05-24 00:59:01 +07:00
701d338055 Merge branch 'develop' into 'devops-staging'
Develop

See merge request empatnusabangsa/ppob/ppob-frontend!176
2022-05-23 14:51:32 +00:00
6598dff0ba Merge branch 'devops-staging' into 'develop'
Devops staging

See merge request empatnusabangsa/ppob/ppob-frontend!175
2022-05-23 14:39:59 +00:00
6c4a78f871 feat: add column partner fee in list product role admin 2022-05-23 21:36:27 +07:00
1e13b4e718 Merge branch 'develop' into 'devops-staging'
feat: validasi detail product admin partner

See merge request empatnusabangsa/ppob/ppob-frontend!174
2022-05-12 10:40:35 +00:00
8737da9da4 feat: validasi detail product admin partner 2022-05-12 17:39:15 +07:00
e6fac2559f Merge branch 'develop' into 'devops-staging'
feat: validasi detail product admin partner

See merge request empatnusabangsa/ppob/ppob-frontend!173
2022-05-12 10:20:52 +00:00
e98914fb86 feat: validasi detail product admin partner 2022-05-12 17:19:57 +07:00
e8105bc7c2 Merge branch 'develop' into 'devops-staging'
feat: hide column tindakan admin partner

See merge request empatnusabangsa/ppob/ppob-frontend!171
2022-05-12 10:11:34 +00:00
77513308a2 feat: hide column tindakan admin partner 2022-05-12 17:10:28 +07:00
f035016487 Merge branch 'develop' into 'devops-staging'
feat: hide column tindakan admin partner

See merge request empatnusabangsa/ppob/ppob-frontend!170
2022-05-12 10:02:48 +00:00
e883078103 feat: hide column tindakan admin partner 2022-05-12 17:00:53 +07:00
507e10f979 Merge branch 'develop' into 'devops-staging'
feat: revisi fixing filter admin partner and add column biaya admin

See merge request empatnusabangsa/ppob/ppob-frontend!169
2022-05-11 13:35:20 +00:00
6a26068339 feat: revisi fixing filter admin partner and add column biaya admin 2022-05-11 20:33:04 +07:00