home spinner

redux/globalReducer.js

@@ -261,9 +261,7 @@ const rootReducer = (state = globalState, action) => {
                 session_id: action.data.session_id,
             }
         }
-
         
-
         case ActionType.ADD_TO_CHART: {
 
             let addedItem = action.data.item
@@ -366,8 +364,6 @@ const rootReducer = (state = globalState, action) => {
                     order_quantity: quantity,
                     order_total: total
                 }
-        
-
 
         }
 

view/DeliveryAddrees.js

@@ -44,13 +44,6 @@ class DeliveryAddrees extends React.Component {
             }
 
             this.props.setGrab(setGrabProps);
-            
-
-            // let OutletChange = {
-            //     outlet_id: this.state.outlet_id , 
-            // }
-    
-            // this.props.setChangeOutletProps(OutletChange);
 
         }).catch(error => {
             console.log('ini error ' + error)
@@ -98,22 +91,23 @@ class DeliveryAddrees extends React.Component {
 
     onSave(address) {
 
+        let setDataAddress = {
+            address : address,
+            addressId : this.state.data[0].id
+        }
+
+        this.props.setAddress(setDataAddress);
         Alert.alert(
             '',
             'Apakah anda akan memilih alamat untuk pengiriman ?',
             [
              
-              {text: 'OK', onPress: () => this.props.navigation.navigate('Home', { screen: 'MENU' })},
+              {text: 'OK', onPress: () => this.props.navigation.navigate("Menu Select")},
             ],
             { cancelable: false }
           )
 
-          let setDataAddress = {
-              address : address,
-              addressId : this.state.data[0].id
-          }
-
-          this.props.setAddress(setDataAddress);
+        
     }
 
 

view/MenuSelection.js

 import React from 'react';
-import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Image, FlatList, Button, Alert, StatusBar, SafeAreaView, SectionList } from 'react-native';
+import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Image, FlatList, Button, StatusBar, ActivityIndicator } from 'react-native';
 import Axios from 'axios';
 import Item from './Item';
 import { connect } from 'react-redux';
@@ -19,10 +19,11 @@ class MenuSelection extends React.Component {
       qty: 1,
       order_list: [],
       list_cart: [],
+      indicator: true,
+
     }
   }
   componentDidMount() {
-    console.log("INI YA :" + JSON.stringify(this.props.outlet_id) )
     this.getMenuList()
   }
 
@@ -37,16 +38,15 @@ class MenuSelection extends React.Component {
       console.log("INI DATANYA" + JSON.stringify(data))
       this.setState({
         listCategory: data.category,
-        listMenu: data.menu
+        listMenu: data.menu,
+        indicator: false
       })
 
       let last_category = ''
       let list_menu = []
 
       for (let i = 0; i < data.menu.length; i++) {
-
         const row = data.menu[i];
-
         // cari sudah ada belum di redux
         let is_xist = this.props.order_item.find(item => row.id == item.id)
         if (is_xist) {
@@ -85,25 +85,11 @@ class MenuSelection extends React.Component {
       </View>
     )
   }
-  // scroll(item) {
-  //   this.refs._scrollView.scrollTo(0);
-  // }
 
   refresh() {
     this.setState({ isFetching: true }, function () { this.getMenuList() });
   }
 
-  // handleRemove(item, index) {
-  //   const listMenu = [...this.state.listMenu]
-  //   if (listMenu[index].qty !== 0) {
-  //     listMenu[index].qty -= 1
-  //     this.setState({
-  //       listMenu
-  //     })
-  //   }
-
-  // }
-
   scrollToItem = () => {
 
     this.props._scrollView.scrollTo({ y: 1 * 100 });
@@ -114,11 +100,11 @@ class MenuSelection extends React.Component {
 
     const order_item = {
       id: item.id,
-      code:item.code,
+      code: item.code,
       name: item.name,
       description: item.description,
-      note:'jangan garing',
-      image:item.image,
+      note: 'jangan garing',
+      image: item.image,
       price: parseInt(item.price),
     }
 
@@ -144,9 +130,9 @@ class MenuSelection extends React.Component {
   }
 
 
-  clearNegatif(item,index){
+  clearNegatif(item, index) {
     const list_order_item = this.props.order_item;
-    for (let i  = 0; i < list_order_item.length; index++) { 
+    for (let i = 0; i < list_order_item.length; index++) {
       const row = list_order_item[i];
       if (row.quantity !== 0) {
         const order_item = {
@@ -156,7 +142,7 @@ class MenuSelection extends React.Component {
         }
         this.props.reduceQuantityItem(order_item)
       }
-      
+
     }
   }
 
@@ -169,7 +155,7 @@ class MenuSelection extends React.Component {
           id: item.id,
           name: item.name,
           price: item.price,
-    
+
         }
         this.props.reduceQuantityItem(order_item)
 
@@ -180,16 +166,6 @@ class MenuSelection extends React.Component {
         this.setState({
           listMenu
         })
-
-
-        
-        // for (let i = 0; i < list_order_item.length; i++) {
-        //   const row = list_order_item[i];
-        //   if (row.id == item.id) {
-        //     quantity = row.quantity
-        //   }
-         
-        // }
       }
     }
   }
@@ -199,6 +175,7 @@ class MenuSelection extends React.Component {
       <View style={styles.container}>
         <StatusBar hidden={true} />
         <View style={{ flex: 0.7, height: 90, flexDirection: 'row', borderWidth: 1, }}>
+
           <FlatList horizontal={true} style={{ flexDirection: 'row' }}
             showsHorizontalScrollIndicator={false}
             data={this.state.listCategory}
@@ -207,18 +184,22 @@ class MenuSelection extends React.Component {
           />
         </View>
         <View style={{ flex: 3 }}>
-          <FlatList
-
-            data={this.state.listMenu}
-            renderItem={({ item, index }) => (
-              <Item navigation={this.props.navigation}
-                item={item}
-                handleAdd={() => this.handleAdd(item, index)}
-                handleMin={() => this.handleMin(item, index)}
+          {this.state.indicator == true ? (
+            <ActivityIndicator style={{top:10}} size="large" color="#c9af6d" />
+          ) : (
+              <FlatList
+
+                data={this.state.listMenu}
+                renderItem={({ item, index }) => (
+                  <Item navigation={this.props.navigation}
+                    item={item}
+                    handleAdd={() => this.handleAdd(item, index)}
+                    handleMin={() => this.handleMin(item, index)}
+                  />
+                )}
+                keyExtractor={item => item.id}
               />
             )}
-            keyExtractor={item => item.id}
-          />
         </View>
         <View style={styles.shadow}>
           <View style={{ flexDirection: 'row', }}>
@@ -267,7 +248,7 @@ const mapStateToProps = (state) => {
     order_total: state.order_total,
     quantity: state.quantity,
     address: state.address,
-    
+
 
   }
 }

view/ShoppingCart.js

@@ -65,7 +65,6 @@ class ShoppingCart extends React.Component {
         }
     }
 
-
     handleMin(item, index) {
         console.log("hai")
         const list_order_item = this.props.order_item;
@@ -200,7 +199,6 @@ class ShoppingCart extends React.Component {
         console.log("INI PROPS" + this.props.address)
     }
 
-
     _getPermissions = async () => {
         let { status } = await Permissions.askAsync(Permissions.LOCATION);
         if (status !== 'granted') {
@@ -736,8 +734,6 @@ const mapDispatchToProps = (dispacth) => {
                 pointused: setOrdersProps.pointused,
             }
         }),
-       
-    
     }
 }