Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

# Conflicts:
#	redux/globalReducer.js

redux/globalReducer.js

@@ -73,6 +73,8 @@ const globalState = {
     grabdropoff: '',
     grabdestination: '',
 
+    notes:'',
+
     balanceUsed: '',
     pointused: '',
 
@@ -194,6 +196,7 @@ const rootReducer = (state = globalState, action) => {
                 email: action.data.email,
             }
         }
+        
         case ActionType.SET_PROSES: {
             return {
                 ...state,
@@ -715,8 +718,10 @@ const rootReducer = (state = globalState, action) => {
 
         case ActionType.SET_EDIT_NOTE: {
             const update = action.data.item;
-            
-            // Cara 1
+            // const menu = action.data.item
+            // console.log("INI HASILNY"+ menu)
+
+            // Update shopping chart pakai cara 1
             updated_data = []
             for (let i = 0; i < state.order_item.length; i++) {
                 const old_data = state.order_item[i];
@@ -733,7 +738,7 @@ const rootReducer = (state = globalState, action) => {
                 }
             }
 
-            // Cara 2
+            // Update menu list pakai cara 2
             updated_menu = state.menu_item
             
             // dicari dulu index keberapa yg mau diupdate notenya