Commits · 8b89561d28d0cc25c1b7a856e0dba7cdbf29304f · Prasetya Saputra / clone_excelso

12 May, 2020 19 commits
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 8b89561d
  Trisno authored May 12, 2020
  
  8b89561d
- update sampe order · 68fc5794
  Trisno authored May 12, 2020
  
  68fc5794
- add outlets pertama · f5b33cc3
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f5b33cc3
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 07102d44
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  07102d44
- add reward/diskon · 3055a794
  Trisno authored May 12, 2020
  
  3055a794
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 6c13851b
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  6c13851b
- tambah touchableopacity di voucher shopping cart · 3601ac20
  Trisno authored May 12, 2020
  
  3601ac20
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · ffb55903
  Wahyu Adjie Prasetyo authored May 12, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  ffb55903
- sdsd · 5161e829
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  5161e829
- add reward di shopping cart · 37ecc649
  Trisno authored May 12, 2020
  
  37ecc649
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 16c8be4d
  Trisno authored May 12, 2020
  
  16c8be4d
- update reward list · e943baed
  Trisno authored May 12, 2020
  
  e943baed
- perubahan design 2 · 136a5c30
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  136a5c30
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · f2d56bfe
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f2d56bfe
- perubahan design 1 · a74daa9e
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  a74daa9e
- update reward select dan reward list · 0f3a3559
  Trisno authored May 12, 2020
  
  0f3a3559
- add detail reward redux · f813a651
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f813a651
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · c635aeab
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  c635aeab
- fungsi expired sudah jalan · 4e3edb32
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  4e3edb32
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