Commits · b13773e9d6d92314fd2be0e54128b42a582d1292 · Prasetya Saputra / clone_excelso

11 May, 2020 7 commits
- update reward select · b13773e9
  Trisno authored May 11, 2020
  
  b13773e9
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · e443f3d5
  Trisno authored May 11, 2020
  
  e443f3d5
- add reward select · 87466357
  Trisno authored May 11, 2020
  
  87466357
- change reward detail · 58fe8ad6
  Wahyu Adjie Prasetyo authored May 11, 2020
  
  58fe8ad6
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 0e7652ba
  Wahyu Adjie Prasetyo authored May 11, 2020
  
  0e7652ba
- change · 51963584
  Wahyu Adjie Prasetyo authored May 11, 2020
  
  51963584
- update design reward list · 3c2fa17b
  Trisno authored May 11, 2020
  
  3c2fa17b
08 May, 2020 9 commits
- reward detail for html · 3c9b1e99
  Wahyu Adjie Prasetyo authored May 08, 2020
  
  3c9b1e99
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 9d01a62b
  Wahyu Adjie Prasetyo authored May 08, 2020
  
  9d01a62b
- add reward list · 0e25d3de
  Trisno authored May 08, 2020
  
  0e25d3de
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 8509f180
  Trisno authored May 08, 2020
```
# Conflicts:
#	view/Auth.js
```
  8509f180
- add rewards list · 111cb9cc
  Trisno authored May 08, 2020
  
  111cb9cc
- item · 53a2ec51
  Wahyu Adjie Prasetyo authored May 08, 2020
  
  53a2ec51
- add reward detail · 0594aa98
  Wahyu Adjie Prasetyo authored May 08, 2020
  
  0594aa98
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 335a7946
  Afid authored May 08, 2020
  
  335a7946
- bug pertama kali langsung edit quantity tidak bisa · 9a70f352
  Afid authored May 08, 2020
  
  9a70f352
07 May, 2020 5 commits
- ini terbaru · 0cb5cf69
  Wahyu Adjie Prasetyo authored May 07, 2020
  
  0cb5cf69
- bisa order via change quantity textinput di shopping cart · 864a60ee
  Trisno authored May 07, 2020
  
  864a60ee
- bisa order via change quantity text input · 4e499392
  Trisno authored May 07, 2020
  
  4e499392
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 4aff7651
  Afid authored May 07, 2020
```
# Conflicts:
#	redux/globalActionType.js
#	redux/globalReducer.js
#	view/Item.js
#	view/ItemShopingCart.js
```
  4aff7651
- change quantity · e1aa0de1
  Afid authored May 07, 2020
  
  e1aa0de1
06 May, 2020 12 commits
- update · 1b3ca2f8
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  1b3ca2f8
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 7854ba1a
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  7854ba1a
- xxx · 6fcf4afd
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  6fcf4afd
- order detail · 6be89811
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  6be89811
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 004e96f7
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  004e96f7
- ww · c93f3dcb
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  c93f3dcb
- hilangin loadingnya kalo get menu nya sudah selesai · f5cf5b1e
  Afid authored May 06, 2020
  
  f5cf5b1e
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · a58e0864
  Wahyu Adjie Prasetyo authored May 06, 2020
```
# Conflicts:
#	view/MenuSelection.js
```
  a58e0864
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 1f762bf6
  Wahyu Adjie Prasetyo authored May 06, 2020
```
# Conflicts:
#	view/MenuSelection.js
```
  1f762bf6
- change location · d49738ca
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  d49738ca
- ubah sedikit · 8ab729d7
  Afid authored May 06, 2020
  
  8ab729d7
- tambah di menu · 0ee7c8a8
  Wahyu Adjie Prasetyo authored May 06, 2020
  
  0ee7c8a8
05 May, 2020 7 commits
- we · 6f339910
  Wahyu Adjie Prasetyo authored May 05, 2020
  
  6f339910
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 0bbba340
  Wahyu Adjie Prasetyo authored May 05, 2020
```
# Conflicts:
#	view/DeliveryAddrees.js
```
  0bbba340
- alert untuk grab · 1af1f3f6
  Wahyu Adjie Prasetyo authored May 05, 2020
  
  1af1f3f6
- tambah alert ketika error · d3bcaade
  Trisno authored May 05, 2020
  
  d3bcaade
- tambah ongkir · 67fa458f
  Trisno authored May 05, 2020
  
  67fa458f
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · cc204930
  Trisno authored May 05, 2020
  
  cc204930
- fix recalculate, cek menu,balance, verifikasi sebelum checkout · 7f8fc28c
  Trisno authored May 05, 2020
  
  7f8fc28c