Commits · 4aff7651b6b97ddfb317ac5eba01b2373de646b1 · Prasetya Saputra / clone_excelso

07 May, 2020 2 commits
- 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 11 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
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · cba8fd80
  Wahyu Adjie Prasetyo authored May 05, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  cba8fd80
- change delivery · 89ea7675
  Wahyu Adjie Prasetyo authored May 05, 2020
  
  89ea7675
- confirm dialog ketika mau dikosongkan · 4e013512
  Afid authored May 05, 2020
  
  4e013512
- session sudah bsa · 4a565ff6
  Wahyu Adjie Prasetyo authored May 05, 2020
  
  4a565ff6
04 May, 2020 15 commits
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 82acc429
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  82acc429
- hilangin console.log · be5fa969
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  be5fa969
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 501fb054
  Afid authored May 04, 2020
```
# Conflicts:
#	view/Account.js
#	view/ShoppingCart.js
```
  501fb054
- update price shopping cart sesuai outletnya · 6ea744fa
  Afid authored May 04, 2020
  
  6ea744fa
- hapus console.log · fbb969aa
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  fbb969aa
- ini udah bisa · c5af5e89
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  c5af5e89
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 9e0f0674
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  9e0f0674
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 09dc293c
  Wahyu Adjie Prasetyo authored May 04, 2020
```
# Conflicts:
#	view/MenuSelection.js
```
  09dc293c
- menu selection set di global variabel agar mudah dalam manipulasi · fdbf2451
  Afid authored May 04, 2020
  
  fdbf2451
- klo belum dapat location jgn load menu · f72d6870
  Afid authored May 04, 2020
  
  f72d6870
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · ec8a6ac2
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  ec8a6ac2
- perubahan · 86a65022
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  86a65022
- address id langsung ambil aja · dcb8f60a
  Afid authored May 04, 2020
  
  dcb8f60a
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 605b08d4
  Wahyu Adjie Prasetyo authored May 04, 2020
```
# Conflicts:
#	view/Account.js
#	view/Home.js
#	view/MenuConfirmation.js
```
  605b08d4
- ini perubahan tapi belum bisa · 9ca2ec6b
  Wahyu Adjie Prasetyo authored May 04, 2020
  
  9ca2ec6b