Commit Graph

560 Commits

Author SHA1 Message Date
ilham
0f801483a3 fix: add code in categories and subcategories 2021-12-16 19:04:38 +07:00
ilham dwi pratama
9e18725e16 Merge branch 'development' into 'devops-staging'
fix: add rol in get user

See merge request empatnusabangsa/ppob/ppob-backend!29
2021-12-16 11:13:32 +00:00
ilham
e82ab2c3e1 fix: add rol in get user 2021-12-16 18:12:20 +07:00
ilham dwi pratama
f63dad68ed Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!28
2021-12-16 10:31:36 +00:00
ilham
affa1b0d46 Merge remote-tracking branch 'origin/development' into development 2021-12-16 17:29:08 +07:00
ilham
c3de4f56e1 fix: add user deetail in get all user 2021-12-16 17:28:56 +07:00
Catur Bagaskara
334761dfcf Merge branch 'development' into 'devops-staging'
fix: add user deetail in get all user

See merge request empatnusabangsa/ppob/ppob-backend!27
2021-12-16 08:45:03 +00:00
caturbgs
fabc663021 fix: user detail relations 2021-12-16 15:34:56 +07:00
ilham
e43ec5129d fix: add user deetail in get all user 2021-12-16 15:33:44 +07:00
ilham dwi pratama
1a33d0268f Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!26
2021-12-16 08:06:24 +00:00
ilham
bd469fe66a fix: add coa in supplier 2021-12-16 15:05:16 +07:00
ilham
264b7312ed fix: add coa in supplier 2021-12-16 15:05:10 +07:00
ilham dwi pratama
72d5d8658a Merge branch 'development' into 'devops-staging'
fix: add user detail on create member

See merge request empatnusabangsa/ppob/ppob-backend!25
2021-12-16 06:38:37 +00:00
ilham
dcad18339b fix: add user detail on create member 2021-12-16 13:37:44 +07:00
Catur Bagaskara
c7f80d8cb2 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!24
2021-12-16 03:20:32 +00:00
343a48280f Update Dockerfile 2021-12-16 03:02:04 +00:00
ilham
8c5e944cc8 fix: get tranasction history by user 2021-12-15 15:17:59 +07:00
ilham
53575f36d6 fix: order product 2021-12-15 08:51:05 +07:00
ilham dwi pratama
2c0cef8575 Merge branch 'development' into 'devops-staging'
fix: yarn lock

See merge request empatnusabangsa/ppob/ppob-backend!23
2021-12-14 15:36:30 +00:00
ilham
e8bbc1e554 fix: yarn lock 2021-12-14 22:35:41 +07:00
ilham dwi pratama
940c288abb Merge branch 'development' into 'devops-staging'
fix: yarn lock

See merge request empatnusabangsa/ppob/ppob-backend!22
2021-12-14 15:32:34 +00:00
ilham
0b644f42ce fix: yarn lock 2021-12-14 22:31:53 +07:00
ilham dwi pratama
d2b792e5ef Merge branch 'development' into 'devops-staging'
fixing: get product by supplier and categories

See merge request empatnusabangsa/ppob/ppob-backend!21
2021-12-14 15:19:12 +00:00
ilham
6951d052ff fixing: get product by supplier and categories 2021-12-14 22:15:21 +07:00
ilham dwi pratama
ab50354f06 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!20
2021-12-14 14:54:59 +00:00
ilham
a3ce252e3c Merge branch 'development' of gitlab.com:empatnusabangsa/ppob/ppob-backend into development
# Conflicts:
#	package.json
2021-12-14 21:52:36 +07:00
ilham
6f1f82cc03 fixing: get product 2021-12-14 21:48:21 +07:00
caturbgs
b4cd5620e5 feat: add get profile endpoint 2021-12-14 21:16:28 +07:00
caturbgs
3835b0ee35 feat: add set status membership endpoint 2021-12-14 20:38:23 +07:00
Catur Bagaskara
f4e3842ae6 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!19
2021-12-14 13:08:22 +00:00
caturbgs
cab057f683 feat: add set status supplier endpoint 2021-12-14 20:05:13 +07:00
caturbgs
091d4220db feat: add update supplier endpoint 2021-12-14 19:57:07 +07:00
Catur Bagaskara
e6659481de Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!18
2021-12-14 09:10:13 +00:00
caturbgs
e07503e70a build: add pino dependency in package json 2021-12-14 16:04:31 +07:00
caturbgs
04fd5c571f feat: add change status partner endpoint 2021-12-14 16:03:59 +07:00
caturbgs
6b1352e671 feat: add update partner endpoint 2021-12-14 15:18:25 +07:00
ilham dwi pratama
6e311f3b5a Merge branch 'development' into 'devops-staging'
fix jwt

See merge request empatnusabangsa/ppob/ppob-backend!17
2021-12-14 04:01:35 +00:00
26e7401163 fix jwt 2021-12-14 03:54:30 +07:00
ilham dwi pratama
02be8ac43e Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!16
2021-12-13 04:43:06 +00:00
ilham
ff60406af2 add:partner module 2021-12-13 00:49:13 +07:00
ilham
78470a0e3f fix: distribute saldo partner from admin 2021-12-12 01:01:37 +07:00
ilham
ed5ca6556d add: top up saldo supplier 2021-12-12 00:23:13 +07:00
ilham
14a00988d9 add: create supplier 2021-12-11 23:45:03 +07:00
ilham
d332935e85 add: commission setting 2021-12-11 11:24:28 +07:00
ilham dwi pratama
f4c4544d93 Merge branch 'development' into 'devops-staging'
add validation in create member

See merge request empatnusabangsa/ppob/ppob-backend!15
2021-12-10 08:32:06 +00:00
ilham
38dedebae7 add validation in create member 2021-12-10 15:31:19 +07:00
ilham dwi pratama
5ee11a7e22 Merge branch 'development' into 'devops-staging'
add roles in findBySupperior

See merge request empatnusabangsa/ppob/ppob-backend!14
2021-12-10 07:27:54 +00:00
ilham
cc9a92dbab add roles in findBySupperior 2021-12-10 14:26:01 +07:00
ilham dwi pratama
b94c77a431 Merge branch 'development' into 'devops-staging'
Development

See merge request empatnusabangsa/ppob/ppob-backend!13
2021-12-10 07:19:58 +00:00
ilham
6730c773fc add 2021-12-10 14:19:09 +07:00