Commit ac9f3813 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo

benerin bug item pas di klik force close

parent 86903eaf
...@@ -383,7 +383,7 @@ const rootReducer = (state = globalState, action) => { ...@@ -383,7 +383,7 @@ const rootReducer = (state = globalState, action) => {
update.quantity = 1 update.quantity = 1
} }
update.quantity += 1 update.quantity += 1
console.log('Update : ' + JSON.stringify(update)) // console.log('Update : ' + JSON.stringify(update))
data = { ...old_data, ...update } data = { ...old_data, ...update }
} }
...@@ -394,7 +394,7 @@ const rootReducer = (state = globalState, action) => { ...@@ -394,7 +394,7 @@ const rootReducer = (state = globalState, action) => {
} else { } else {
// add // add
addedItem.quantity = 1 addedItem.quantity = 1
console.log('Baru : ' + JSON.stringify(addedItem)) // console.log('Baru : ' + JSON.stringify(addedItem))
order_item = [...state.order_item, addedItem] order_item = [...state.order_item, addedItem]
} }
...@@ -590,7 +590,7 @@ const rootReducer = (state = globalState, action) => { ...@@ -590,7 +590,7 @@ const rootReducer = (state = globalState, action) => {
let quantity = state.order_quantity let quantity = state.order_quantity
let total = parseInt(state.order_total) - parseInt(addedItem.price) let total = parseInt(state.order_total) - parseInt(addedItem.price)
console.log("UPDATE " + order_item) // console.log("UPDATE " + order_item)
} }
return { return {
......
...@@ -61,9 +61,7 @@ class Item extends React.Component { ...@@ -61,9 +61,7 @@ class Item extends React.Component {
render() { render() {
const { item } = this.props const { item } = this.props
return ( return (
<View style={{ flex: 1, margin: 10 }} key={item.id} ref={this.props._scrollView}> <View style={{ flex: 1, margin: 10 }}>
{item.code == 'CATEGORY' ? ( {item.code == 'CATEGORY' ? (
<Text style={{ fontSize: 15, color: '#c9af6d', fontFamily: 'Gotham-Black' }}>{item.name}</Text> <Text style={{ fontSize: 15, color: '#c9af6d', fontFamily: 'Gotham-Black' }}>{item.name}</Text>
) : ( ) : (
...@@ -103,13 +101,13 @@ class Item extends React.Component { ...@@ -103,13 +101,13 @@ class Item extends React.Component {
</View> </View>
</View> </View>
</Modal> </Modal>
<View style={{ flex: 1 }}> <View style={{ flex: 0.6 }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Menu Detail', { nameMenu: item.name, desc: item.description, image: item.image })}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Menu Detail', { nameMenu: item.name, desc: item.description, image: item.image })}>
{/* <Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 10, }}></Image> */} {/* <Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 10, }}></Image> */}
<Image style={{ height: 100, width: 100, borderRadius: 10, }} source={item.image ? {uri: item.image } : null} /> <Image style={{ height: 100, width: 100, borderRadius: 10, }} source={item.image ? {uri: item.image } : null} />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={{ flex: 1}}> <View style={{ flex: 0.7}}>
<View style={{ marginLeft: 5, marginRight: 5 }}> <View style={{ marginLeft: 5, marginRight: 5 }}>
{ {
item.motm ? ( item.motm ? (
......
...@@ -31,8 +31,8 @@ class MenuSelection extends React.Component { ...@@ -31,8 +31,8 @@ class MenuSelection extends React.Component {
indicator: true, indicator: true,
my_lat: 0, my_lat: 0,
my_long: 0, my_long: 0,
data:[], data: [],
data_before_search: this.props.menu_item, data_before_search: '',
note: '' note: ''
} }
} }
...@@ -140,11 +140,7 @@ class MenuSelection extends React.Component { ...@@ -140,11 +140,7 @@ class MenuSelection extends React.Component {
let data = res.data.data let data = res.data.data
// console.log("INI DATANYA" + JSON.stringify(data)) // console.log("INI DATANYA" + JSON.stringify(data))
this.setState({
listCategory: data.category,
listMenu: data.menu,
indicator: false
})
// let last_category = '' // let last_category = ''
// let list_menu = [] // let list_menu = []
...@@ -177,8 +173,11 @@ class MenuSelection extends React.Component { ...@@ -177,8 +173,11 @@ class MenuSelection extends React.Component {
// }) // })
this.props.updateMenu(data.menu) this.props.updateMenu(data.menu)
this.setState({ this.setState({
listCategory: data.category,
listMenu: data.menu,
indicator: false,
data_before_search: this.props.menu_item,
indicator: false indicator: false
}) })
...@@ -191,18 +190,26 @@ class MenuSelection extends React.Component { ...@@ -191,18 +190,26 @@ class MenuSelection extends React.Component {
} }
filterSubcategory = (item) => { filterSubcategory = (item) => {
try {
let index_start = _.findIndex(this.props.menu_item, ['name', item.name]) let index_start = _.findIndex(this.props.menu_item, ['name', item.name])
let index_next_category = _.findIndex(this.state.listCategory, ['name', item.name]) + 1 let index_next_category = _.findIndex(this.state.listCategory, ['name', item.name]) + 1
let next_category = this.state.listCategory[index_next_category] let next_category = this.state.listCategory[index_next_category]
let index_end = _.findIndex(this.props.menu_item, ['name', next_category.name]) let index_end = _.findIndex(this.props.menu_item, ['name', next_category.name])
let filter_item = this.props.menu_item.slice(index_start, index_end); let filter_item = this.props.menu_item.slice(index_start, index_end);
this.setState({
data_before_search: filter_item
})
} catch (error) {
let index_start = _.findIndex(this.props.menu_item, ['name', item.name])
let index_end = item.length - 1
let filter_item = this.props.menu_item.slice(index_start, index_end);
this.setState({ this.setState({
data_before_search: filter_item data_before_search: filter_item
}) })
} }
}
renderTabBar = ({ item }) => { renderTabBar = ({ item }) => {
return ( return (
...@@ -220,7 +227,6 @@ class MenuSelection extends React.Component { ...@@ -220,7 +227,6 @@ class MenuSelection extends React.Component {
) )
} }
renderItem = ({ item, index }) => { renderItem = ({ item, index }) => {
return ( return (
<View> <View>
...@@ -275,10 +281,6 @@ class MenuSelection extends React.Component { ...@@ -275,10 +281,6 @@ class MenuSelection extends React.Component {
// }) // })
} }
clearNegatif(item, index) { clearNegatif(item, index) {
const list_order_item = this.props.order_item; 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++) {
...@@ -333,13 +335,13 @@ class MenuSelection extends React.Component { ...@@ -333,13 +335,13 @@ class MenuSelection extends React.Component {
} }
} }
getItemLayout = (data, index) => ( // getItemLayout = (data, index) => (
{ // {
length: 100, // length: 100,
offset: 100 * index, // offset: 100 * index,
index // index
} // }
) // )
// setLastIndex = (index) => { // setLastIndex = (index) => {
// las // las
...@@ -380,8 +382,8 @@ class MenuSelection extends React.Component { ...@@ -380,8 +382,8 @@ class MenuSelection extends React.Component {
maxToRenderPerBatch={10} maxToRenderPerBatch={10}
windowSize={10} windowSize={10}
/> />
):( ) : (
<Text style={{ flexWrap: 'wrap', fontFamily: 'Gotham-Light', color: '#b1b1b2', textAlign: 'center',top:20 }}> Tidak Ada Menu untuk kategory ini !</Text> <Text style={{ flexWrap: 'wrap', fontFamily: 'Gotham-Light', color: '#b1b1b2', textAlign: 'center', top: 20 }}> Tidak Ada Menu untuk kategory ini !</Text>
) )
)} )}
</View> </View>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment