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

redux/globalReducer.js

@@ -621,7 +621,7 @@ const rootReducer = (state = globalState, action) => {
                     row['note'] = is_xist.note
                 } else {
                     row['qty'] = 0
-                    row['note'] = 'Kosong'
+                    row['note'] = ''
                 }
 
                 if (last_category != row.category.name) {

view/ItemShopingCart.js

@@ -43,9 +43,15 @@ class ItemShoping extends React.Component {
     }
 
     handleEdit = (item) =>{
+        let note = ''
+        if (this.state.note === '') {
+            note = item.note;
+        } else {
+            note = this.state.note;
+        }
         const order_item = {
             id: item.id,
-            note: this.state.note,
+            note: note,
         }
 
         this.props.setNotes({ item: order_item })