Commit Graph

439 Commits

Author SHA1 Message Date
84460f02f4 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-28 19:01:16 +07:00
6d751f02b6 Config Menu Product Partner 2021-12-28 19:00:50 +07:00
ilham
41e99814b8 fix: remove menu 2021-12-28 18:36:26 +07:00
c7d3012bb1 Perbaikan Project PPOB 2021-12-28 16:21:45 +07:00
beb3cdf6d1 Perbaikan Project PPOB 2021-12-28 15:58:29 +07:00
7ad15665cc Perbaikan Project PPOB 2021-12-28 13:46:52 +07:00
bf0e28c4f3 Perbaikan Projek PPOB 2021-12-27 18:58:51 +07:00
4d0c37ec9b Perbaikan Project PPOB 2021-12-27 18:52:54 +07:00
d590b94a6c Perbaikan Project PPOB 2021-12-27 17:50:24 +07:00
8a2bde5ba8 Perbaikan Project PPOB 2021-12-27 15:55:34 +07:00
ilham
668c64f193 fix: add code in partner 2021-12-26 11:19:57 +07:00
69fc55338d Fixing Menu 2021-12-24 14:50:46 +07:00
65c9c0b39d Fixed Menu 2021-12-24 13:23:00 +07:00
3204ba4b38 Menu Fixing 2021-12-24 12:58:41 +07:00
c715069d63 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-24 10:49:42 +07:00
c371a727b1 Repair Menu 2021-12-24 10:48:06 +07:00
caturbgs
fbad2d68e8 feat: add phone number on buy product 2021-12-24 01:44:55 +07:00
caturbgs
5ac16feb6b fix: format date on profile 2021-12-24 01:29:59 +07:00
caturbgs
c68d8105e3 feat: remove extra whitespace 2021-12-24 00:57:42 +07:00
caturbgs
7c38f65ba9 feat: ajust detail user 2021-12-24 00:54:29 +07:00
caturbgs
258dd4af34 feat: link detail url 2021-12-23 23:21:12 +07:00
caturbgs
98e7827247 feat: add separated column in date and add pagination on price history on product detail 2021-12-23 23:16:47 +07:00
caturbgs
097782d791 fix: role button new product admin 2021-12-23 21:51:37 +07:00
caturbgs
52a75ff081 feat: move upload into modal 2021-12-23 21:31:37 +07:00
884a23ae80 Repair Menu 2021-12-23 19:32:29 +07:00
5229359425 Repair Menu 2021-12-23 19:18:27 +07:00
71e6f00fcd Repair Menu 2021-12-23 17:46:22 +07:00
2349912c73 Repair Menu 2021-12-23 17:06:49 +07:00
195e0e80e4 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-23 17:05:44 +07:00
bd2696efca Reparing Menu 2021-12-23 17:05:03 +07:00
caturbgs
4d40a6f475 feat: force reload if logout 2021-12-23 16:50:34 +07:00
caturbgs
3be7561c3c chore: handler errors upload excel product 2021-12-23 16:48:52 +07:00
caturbgs
78d00da35d chore: remove ununsed code to update user 2021-12-23 16:35:56 +07:00
caturbgs
1a0a1756b0 chore: move action button into detail user 2021-12-23 16:30:14 +07:00
db6287ca2c Reparing Menu 2021-12-23 16:22:23 +07:00
4e2480dc63 Repair Menu 2021-12-23 16:03:57 +07:00
d221a3987d Repairing Menu 2021-12-23 15:38:15 +07:00
c95aa84026 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-23 15:11:35 +07:00
8ead48ad2a Config Page 2021-12-23 15:06:46 +07:00
caturbgs
91ecdfb541 chore: rewrite function for upload images in payback 2021-12-23 13:51:05 +07:00
caturbgs
d591615e66 feat: add upload excel product functions 2021-12-23 13:50:26 +07:00
caturbgs
edc6d3e317 fix: wording bahasa 2021-12-23 12:18:39 +07:00
caturbgs
a16f42145b fix: detail product 2021-12-23 12:07:29 +07:00
4ba8f07f93 Config Page 2021-12-23 12:05:30 +07:00
ce2d2e1072 Config Menu 2021-12-23 11:53:07 +07:00
caturbgs
6b22d2e264 feat: handler dynamic action columnin payback confirmation, and add column name 2021-12-23 01:24:03 +07:00
caturbgs
a0e42fff8e feat: handler dynamic action columnin payback confirmation, and add column name 2021-12-23 01:23:58 +07:00
caturbgs
874e5dbf5c fix: handler error payback 2021-12-23 00:48:53 +07:00
caturbgs
6a906d0234 fix: change api url approve payback 2021-12-23 00:45:34 +07:00
caturbgs
53a4108e09 fix: change key display product 2021-12-23 00:19:40 +07:00
caturbgs
fdd123bb9f fix: change hide action button in memberhship 2021-12-23 00:04:54 +07:00
caturbgs
28e959c26d fix: change hide action column on admin and supervisor 2021-12-22 23:54:43 +07:00
caturbgs
7e356d0178 fix: add refresh after crd operation in membership contd 2021-12-22 23:43:45 +07:00
caturbgs
38c4aca9be fix: add refresh after crd operation in membership 2021-12-22 23:37:06 +07:00
caturbgs
9be9287fb2 fix: change handler topup membership 2021-12-22 23:20:54 +07:00
caturbgs
7b07d1a1d8 fix: add API payback confirmation 2021-12-22 22:48:34 +07:00
caturbgs
1e92eee5b5 fix: pagination on all page 2021-12-22 22:15:04 +07:00
caturbgs
3bce86ea5f fix: payback menu swap API 2021-12-22 22:06:37 +07:00
caturbgs
8f6620e7aa fix: change wording menu payback 2021-12-22 21:40:07 +07:00
caturbgs
b1d35e2df6 fix: amount in profile 2021-12-22 21:21:17 +07:00
caturbgs
6c5891d407 fix: upload button still loading 2021-12-22 21:07:30 +07:00
caturbgs
54976f02bf feat: rewrite writing variable 2021-12-22 20:44:06 +07:00
caturbgs
a47ae4c85f style: remove get supplier 2021-12-22 20:33:37 +07:00
caturbgs
4facb71d4f style: adjust width column payback 2021-12-22 20:29:21 +07:00
caturbgs
fa3fff13f6 style: add logout icon, and hide profile menu on admin 2021-12-22 20:18:38 +07:00
a115d8488b Handling Error 2021-12-22 19:27:25 +07:00
7928df9fc6 Role Access 2021-12-22 18:01:11 +07:00
78626fd6e9 Role Access 2021-12-22 17:52:05 +07:00
caturbgs
9460935e0a style: add margin into profile popover 2021-12-22 16:58:38 +07:00
caturbgs
119fa6d0bd style: adjust number to currency format 2021-12-22 16:58:38 +07:00
aa2c658f69 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-22 16:47:34 +07:00
9a596abeca Edit Menu Product 2021-12-22 16:45:20 +07:00
caturbgs
81d6407367 fix: dsplay image in payback 2021-12-22 16:19:45 +07:00
caturbgs
73d23b8958 fix: create payback fix image 2021-12-22 16:06:18 +07:00
caturbgs
84ff8c12f8 fix: roles api not fetch 2021-12-22 15:46:41 +07:00
caturbgs
5039fa736a fix: column product 2021-12-22 14:48:50 +07:00
caturbgs
7cf403f19d feat: handler modal dynamic 2021-12-22 14:43:04 +07:00
7edf7650ec Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-22 11:12:25 +07:00
caturbgs
81fffe4528 fix: get data sub category on modal product 2021-12-22 11:09:21 +07:00
45e6b92ee7 Mobile responsive 2021-12-22 11:09:04 +07:00
caturbgs
a89566adc1 fix: change category not default select sub categories 2021-12-22 11:01:48 +07:00
9cefac57ae Refresh Page 2021-12-21 19:24:08 +07:00
fc6b61e21c Pages Detail Product 2021-12-21 17:46:44 +07:00
06c2ac1593 Detail Product 2021-12-21 17:41:08 +07:00
4a2429bd8d Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-21 16:58:07 +07:00
e513621fc4 Detail User 2021-12-21 16:57:34 +07:00
caturbgs
d77054cbc8 feat: add formatting rupiah in payback 2021-12-21 16:39:12 +07:00
caturbgs
69efeca588 fix: product page 2021-12-21 16:28:09 +07:00
caturbgs
90d862a47d fix: handler error buy producy 2021-12-21 16:17:09 +07:00
caturbgs
88260e97b2 fix: handler error buy producy 2021-12-21 16:16:27 +07:00
caturbgs
757c0c291e style: change color tab pane active 2021-12-21 16:07:47 +07:00
caturbgs
056248a651 feat: handler modal payback after create and fix payback paging 2021-12-21 16:04:16 +07:00
ad3b7c6be0 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-21 15:41:54 +07:00
70bb64803c No resfresh pages 2021-12-21 15:41:38 +07:00
caturbgs
95abdb5c97 feat: revert saldo columns in membership 2021-12-21 15:38:36 +07:00
caturbgs
5ead0adb86 feat: add masking password 2021-12-21 15:33:35 +07:00
ede5e7c368 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-21 15:22:13 +07:00
f91cbd02b2 Mobile Responsive 2021-12-21 15:21:58 +07:00
ilham
2d87c65bbc fix: get membership 2021-12-21 15:07:49 +07:00
caturbgs
a4ba756dbc feat: add upload image payback 2021-12-21 14:42:53 +07:00
caturbgs
89b890c888 feat: change payback data page 2021-12-21 12:03:33 +07:00
2165c7a535 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-21 11:44:27 +07:00
3884967dee handling error 2021-12-21 11:43:20 +07:00
caturbgs
94a4f59833 feat: fix login modal loader 2021-12-21 11:38:47 +07:00
Hasta Ragil Saputra
47578366a8 feat: add modal loader for each API request 2021-12-21 09:00:31 +07:00
178d52f5cc Pages Paybcak 2021-12-20 17:28:03 +07:00
45eead9e5d Pages Payback 2021-12-20 17:19:03 +07:00
edc61712ef pages transaction 2021-12-20 17:13:56 +07:00
d5251b0967 Pages Membership
:exit

:q
2021-12-20 16:43:35 +07:00
cdaa4738b0 pages payback 2021-12-20 16:37:34 +07:00
78fb6f3cf0 Pages Payback 2021-12-20 16:19:27 +07:00
ilham
dc31406375 fix: get membership 2021-12-20 15:22:53 +07:00
caturbgs
f2b754a187 feat: fix paging data 2021-12-20 13:59:24 +07:00
caturbgs
1bf45213de feat: init modal loader components 2021-12-20 13:56:08 +07:00
caturbgs
61ec562ca4 feat: init modal loader components 2021-12-20 13:55:19 +07:00
82c9a96339 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-20 13:42:40 +07:00
5f062ed630 post payback 2021-12-20 13:42:24 +07:00
caturbgs
f89a1620db feat: rewrite component use effect 2021-12-20 13:32:22 +07:00
ilham
2e0eb03d3a Merge remote-tracking branch 'origin/develop' into develop 2021-12-20 13:08:27 +07:00
ilham
ead2d51fd8 fix: get product 2021-12-20 13:07:21 +07:00
caturbgs
6b9b3f94b6 feat: add handler error if API unauthorize 2021-12-20 13:01:46 +07:00
caturbgs
c73f642b93 feat: adjust buy product on click 2021-12-17 17:53:09 +07:00
5069f63374 Pages Product 2021-12-17 17:36:13 +07:00
9490fd23b2 fix: revert buy product using modal 2021-12-17 17:21:14 +07:00
f427dc4990 delete menu product for retail 2021-12-17 17:07:13 +07:00
177421717e Membership Pages 2021-12-17 16:45:32 +07:00
2bd704a57a Pages Membership 2021-12-17 16:22:49 +07:00
72a747e66e Pages Membership 2021-12-17 15:56:51 +07:00
4a46c86b30 Pages Membership 2021-12-17 14:31:53 +07:00
551c8ba17e Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-17 14:22:20 +07:00
af05055b9e membership 2021-12-17 14:22:05 +07:00
b1317d141c feat: add number format 2021-12-17 13:30:35 +07:00
8c9a3b05de fix: category store mapping 2021-12-17 06:06:52 +07:00
4f82f9d978 fix: add membership owner 2021-12-17 06:01:12 +07:00
caturbgs
068444fb07 feat: remove action column and handler filter modal product 2021-12-17 02:20:50 +07:00
caturbgs
51e92559e8 feat: change url plural 2021-12-17 01:53:18 +07:00
caturbgs
dfc3ea466f feat: style column 2021-12-17 01:49:38 +07:00
caturbgs
9269ae0858 feat: change price product transaction 2021-12-17 01:45:35 +07:00
caturbgs
29f97f751a feat: add buy product 2021-12-17 01:43:42 +07:00
caturbgs
319948376a feat: get data subcategories 2021-12-17 00:07:58 +07:00
caturbgs
5d765bc763 feat: change query case 2021-12-17 00:02:00 +07:00
caturbgs
20df9934a8 feat: wording 2021-12-16 23:30:33 +07:00
caturbgs
72595b3779 feat: change query 2021-12-16 23:29:00 +07:00
caturbgs
b8c407bf11 feat: adjust flow to display transaction 2021-12-16 23:24:56 +07:00
caturbgs
c1513c9e78 feat: remodel product page 2021-12-16 23:24:56 +07:00
caturbgs
a62315641a feat: adding try catch 2021-12-16 23:24:55 +07:00
2acf3c9d5e Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 21:40:54 +07:00
53a051981f Merge branches 'develop' and 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 21:40:34 +07:00
caturbgs
5d5fa12fce feat: remodel product page 2021-12-16 21:40:20 +07:00
ac13d366c8 fix: membership create & update 2021-12-16 21:39:31 +07:00
caturbgs
cf3afb27c4 feat: remodel product page 2021-12-16 21:36:42 +07:00
d41681c217 feat: completing sub categories 2021-12-16 20:31:59 +07:00
ilham
1cb4ad5e09 Merge remote-tracking branch 'origin/develop' into develop 2021-12-16 19:59:36 +07:00
ilham
d7cb7df6ba fix: remove delete button on master data 2021-12-16 19:59:21 +07:00
caturbgs
7179d8f807 feat: adjust supplier page 2021-12-16 19:51:21 +07:00
ilham
787e74419e fix: supplier menu 2021-12-16 19:48:58 +07:00
088ef0e27e Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 19:36:47 +07:00
a7072d7db2 Pages Categories 2021-12-16 19:36:31 +07:00
caturbgs
b89eebb59b feat: not used create commission 2021-12-16 19:03:15 +07:00
ba01132cd4 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 18:58:04 +07:00
fb7128ff00 Pages Supplier 2021-12-16 18:57:47 +07:00
caturbgs
b50f2d1c0e feat: adjust format in transaction history 2021-12-16 18:45:57 +07:00
f23936da23 Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 18:20:46 +07:00
32c871afc3 feat: membership add name 2021-12-16 18:20:40 +07:00
a0b8ad52be Pages Supplier 2021-12-16 17:55:59 +07:00
c25ce840c7 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 17:47:24 +07:00
34a9cd972b Pages Product 2021-12-16 17:47:05 +07:00
a8a8330941 fix: menus 2021-12-16 17:45:00 +07:00
06eb607c7a Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 16:52:55 +07:00
0765b6027d feat: add Top Up Distribute Admin 2021-12-16 16:52:42 +07:00
caturbgs
0c806f7fb9 feat: responsive saldo layout 2021-12-16 16:50:59 +07:00
5ce366f638 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 16:11:57 +07:00
ac7e5714e7 Pages Supplier 2021-12-16 16:11:36 +07:00
6ce6d67260 Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 16:07:40 +07:00
a29cfd5c92 feat: show membership by superior 2021-12-16 16:07:32 +07:00
caturbgs
14407dd5e3 feat: add additional key profile 2021-12-16 16:01:45 +07:00
caturbgs
17764cc1cb feat: add missing implement user 2021-12-16 15:14:13 +07:00
a093174c7d fix: create new membership 2021-12-16 14:15:30 +07:00
375d122552 add partner activable toggle & change password 2021-12-16 14:01:53 +07:00
a40ccf2518 Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-16 12:50:32 +07:00
6ef3964fdb feat: add membership activable toggle & change password 2021-12-16 12:50:25 +07:00
caturbgs
e206c0e221 feat: add filter button last history transaction 2021-12-16 12:36:42 +07:00
caturbgs
19ef0eee64 feat: change layout profile page 2021-12-16 12:32:55 +07:00
caturbgs
2cc6dc53c0 fix: stiching API profile and last history 2021-12-16 11:12:32 +07:00
caturbgs
28c42b3453 feat: stiching api profile and history transaction.js 2021-12-15 20:36:48 +07:00
6f743301e4 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-15 18:32:42 +07:00
4df9f7214e Menu Supplier 2021-12-15 18:30:27 +07:00
d0b2aec893 feat: change status partner & membership 2021-12-15 18:14:02 +07:00
08b82c55ab Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-15 16:12:30 +07:00
0911e73e43 subcategory page 2021-12-15 16:11:32 +07:00
1be4d4531d fix: key on menu list & product table 2021-12-15 15:54:03 +07:00
6b00b4bb13 Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-15 15:40:59 +07:00
c8278c2cea feat: update supplier status 2021-12-15 15:35:57 +07:00
78f20e76d8 menu list 2021-12-15 15:35:26 +07:00
caturbgs
fa85699760 fix: merge error menu list 2021-12-15 15:33:12 +07:00
d54e2a8669 Page Category 2021-12-15 15:29:01 +07:00
7b95d2901b Page Category 2021-12-15 14:41:00 +07:00
caturbgs
5e3f8fa3a2 feat: add payback page 2021-12-15 13:54:41 +07:00
324dd47709 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-14 18:56:05 +07:00
558ca2a098 Pages Config 2021-12-14 18:52:42 +07:00
caturbgs
89443daa8c feat: profile page 2021-12-14 12:13:39 +07:00
f5903db03e Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-13 18:46:13 +07:00
8f1b07e0e4 pages config 2021-12-13 18:44:28 +07:00
9208bd5dd8 fix: responsive tabs by data T[Transaction page] 2021-12-10 17:59:41 +07:00
1caed6d769 Merge branch 'develop' of gitlab.com:empatnusabangsa/ppob/ppob-frontend into develop 2021-12-10 16:32:51 +07:00
cae14036db stitching pulsa component 2021-12-10 16:32:38 +07:00
72d8566f23 Pages Membership 2021-12-10 16:32:05 +07:00
caturbgs
63413a78f8 fix: pagination and some logic 2021-12-10 16:30:52 +07:00
555775d353 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-10 15:05:14 +07:00
caturbgs
ed278b61fc feat: init profile page layout 2021-12-10 15:02:44 +07:00
caturbgs
c8faca652d feat: config for transaction role 2021-12-10 14:58:01 +07:00
226831bd40 Pages Membership 2021-12-10 14:55:24 +07:00
caturbgs
537e009380 feat: const for routes and init profile page 2021-12-10 14:54:25 +07:00
f262eb45e8 Pages Membership 2021-12-10 14:35:44 +07:00
caturbgs
6a364fe8b4 feat: add roles in Membership 2021-12-10 14:33:55 +07:00
caturbgs
d3ecd09d6f fix: merge conflicts 2021-12-10 13:58:50 +07:00
caturbgs
412ecc827e feat: crud product 2021-12-10 13:57:52 +07:00
91ade48bea Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-10 13:19:06 +07:00
a0207af25e Crud Membership 2021-12-10 13:18:42 +07:00
caturbgs
6da88a97a8 feat: rewrite modal logic product 2021-12-10 12:05:49 +07:00
caturbgs
4d1cd215a1 feat: misc change 2021-12-10 11:06:57 +07:00
ab347b8ff9 Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into develop 2021-12-10 10:53:37 +07:00
4ab1c34946 Data Membership 2021-12-10 10:53:02 +07:00
caturbgs
8a73e728d8 feat: create component product 2021-12-10 10:50:39 +07:00
caturbgs
65252fd2a7 feat: remove unused code 2021-12-09 23:30:38 +07:00
caturbgs
993c24cd36 feat: remove unused code 2021-12-09 23:29:40 +07:00
caturbgs
7a62ad32a9 feat: remove unused code 2021-12-09 23:20:22 +07:00
caturbgs
ed42cb6c0c feat: get data from jwt 2021-12-09 23:18:54 +07:00
caturbgs
4846e7022a feat: implement token in fetch api 2021-12-09 23:06:16 +07:00
caturbgs
84d3085c0c feat: implement login 2021-12-09 23:00:56 +07:00
caturbgs
b346e1fdbd feat: erorr on click 2021-12-09 20:18:07 +07:00
7b6784709e fix: merge ajat 2021-12-09 20:17:07 +07:00
caturbgs
525d5534df fix: card product responsive 2021-12-09 19:55:53 +07:00
caturbgs
7f89e6562b fix: change key 2021-12-09 19:02:02 +07:00
caturbgs
698c59370b fix: scrollable table in product 2021-12-09 17:59:39 +07:00
caturbgs
75580d1e21 fix: responsive layout 2021-12-09 14:35:14 +07:00
caturbgs
5016f9068d fix: responsive each pages 2021-12-09 12:53:55 +07:00
caturbgs
599a89449b feat: init responsive mode 2021-12-09 11:31:02 +07:00
caturbgs
f27ddcfe90 feat: initial commit 2021-12-09 09:01:39 +07:00