terbaru

app.json

 {
   "expo": {
-    "name": "Excelso_update",
+    "name": "Excelso_update v1_sore",
     "slug": "excelso-pro",
     "privacy": "public",
     "sdkVersion": "36.0.0",

view/Auth.js

@@ -111,7 +111,7 @@ function HomePage({navigation}) {
       <Tab.Screen name="HOME" component={Home}  />
       <Tab.Screen name="MENU" component={MenuSelection} />
       <Tab.Screen name="REWARDS" component={Rewards} />
-      <Tab.Screen name="ORDER" component={TransactionHistory} />
+      <Tab.Screen name="ORDER" component={OrderHistory} />
       <Tab.Screen name="OUTLETS" component={Outlets} />
       <Tab.Screen name="ACCOUNT" component={Account} />
     </Tab.Navigator>

view/Home.js

@@ -140,6 +140,14 @@ class Home extends React.Component {
     this.props.navigation.navigate('Pickup Name');
   }
 
+  _order(){
+    let typeProps = {
+      type_pickup: false,
+    }
+    this.props.setTypePickup(typeProps);
+    this.props.navigation.navigate('Delivery Address');
+  }
+
 
   render() {
     return (
@@ -183,7 +191,7 @@ class Home extends React.Component {
             <View style={styles.card}>
               <Card>
                 <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
-                  <TouchableOpacity style={styles.buttonDelivery} onPress={() => this.props.navigation.navigate('Delivery Address')}>
+                  <TouchableOpacity style={styles.buttonDelivery} onPress={() => this._order() }>
                     <Text style={{ textAlign: 'center', color: '#354175', fontWeight: 'bold' }}>{i18n.t('delivery')}</Text>
                   </TouchableOpacity>
                   <TouchableOpacity style={styles.buttonPickup} onPress={() => this._pickup()}>
@@ -250,6 +258,7 @@ class Home extends React.Component {
               <TouchableOpacity style={styles.submitUpgradePemium} activeOpacity={.5} onPress={this.onPress}>
                 <Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>TOP BALANCE </Text>
               </TouchableOpacity>
+              <Text>APP.V2.APRIL</Text>
               <View style={{ height: 60 }}></View>
             </View>
           </View>

view/MenuConfirmation.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { View, Text, Alert, TextInput, StyleSheet, Button, ScrollView } from 'react-native';
 import Axios from 'axios'
 import { connect } from 'react-redux'
+import ActionType from '../redux/globalActionType';
 import Spinner from 'react-native-loading-spinner-overlay';
 class MenuConfirmation extends React.Component {
     constructor(props) {
@@ -66,7 +67,7 @@ class MenuConfirmation extends React.Component {
               );
             
             let typeProps = {
-                type_pickup: false,   
+                type_pickup: true,   
             }
             this.props.setTypePickup(typeProps);
 

view/ShoppingCart.js

@@ -116,6 +116,8 @@ class ShoppingCart extends React.Component {
 
                     this.props.removeFromChart(order_item)
                 }
+
+                
             }
         }
     }