Skip to content

C
clone_excelso
Commit b54398f3 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

nambahin pengecekan di delivery dan pickup

parent d5772b63
Show whitespace changes
Inline Side-by-side
Showing with 422 additions and 147 deletions
view/DeliveryAddrees.js
View file @ b54398f3
......@@ -83,6 +83,8 @@ class DeliveryAddrees extends React.Component {
})
}
getRate(address_id) {
// console.log('ADdress id : ' + address_id)
......@@ -160,7 +162,9 @@ class DeliveryAddrees extends React.Component {
onSave(address, id, name) {
if (this.props.value_voucher !== "") {
this.handleVoucherSelect()
} else {
let setDataAddress = {
address: address,
addressId: id,
......@@ -207,6 +211,7 @@ class DeliveryAddrees extends React.Component {
console.log('ini error ' + response.msg)
Alert.alert('', response.msg)
})
}
// let recalculateProps = {
......@@ -226,7 +231,6 @@ class DeliveryAddrees extends React.Component {
// { cancelable: false }
// )
}
deleteAddress(id) {
......@@ -242,6 +246,64 @@ class DeliveryAddrees extends React.Component {
})
}
handleVoucherSelect() {
//SPINNER ON
this.setState({
spinner: true,
})
//CEK TYPE TRANSAKSINYA DELIVERY OR PICKUP, DICEK UNTUK DI MASUKAN DI PARAMATER PEMANGGILAN API
let type_trans = ""
if (this.props.type_pickup == true) {
type_trans = 'Pickup'
} else {
type_trans = 'Delivery'
}
let params = {
session_id: this.props.session_id,
trans_type: type_trans,
order_item: this.props.order_item,
reward_id: this.props.voucher.id,
delivery_charge: this.props.grabamount,
}
// MULAI DISINI PEMANGGILAN API DI MULAI, KALAU BERHASIL SET VALUE VOUCHER NYA DAN SPINER DIMATIKAN, KALAU GAGAL CABUT SESSION VOUCHER DAN SPINNER DI MATIKAN
Axios.post(this.props.BASE_URL + 'crm/v2/reward/get_value', params).then(res => {
if (this.state.state_add_remove_voucher == true) {
this.setState({
state_add_remove_voucher: false
})
this.props.removeVoucher()
} else{
let voucherProps = {
value_voucher: res.data.reward,
voucher: res.data.reward
}
this.props.setVoucher(voucherProps);
}
this.setState({
spinner: false,
})
}).catch(error => {
try {
let response = error.response.data
Alert.alert("", response.msg)
this.setState({
spinner: false,
})
// FUNGSI REDUX UNTUK HAPUS VOUCHER
this.props.removeVoucher()
} catch (error) {
Alert.alert("", error.toString())
}
})
}
handleDeleteAddress(id) {
Alert.alert(
"",
......@@ -394,8 +456,30 @@ const mapStateToProps = (state) => {
session_id: state.session_id,
addressId: state.addressId,
language: state.language,
outlet_detailadress: state.outlet_detailadress,
home_address: state.home_address,
type_pickup: state.type_pickup,
value_voucher: state.value_voucher,
voucher: state.voucher,
session_id: state.session_id,
outlet_id: state.outlet_id,
name_outlet: state.name_outlet,
value_voucher: state.value_voucher,
voucher: state.voucher,
order_quantity: state.order_quantity,
order_total: state.order_total,
order_item: state.order_item,
quantity: state.quantity,
address: state.address,
addressId: state.addressId,
grabtype: state.grabtype,
grabamount: state.grabamount,
grabpickup: state.grabpickup,
grabdropoff: state.grabdropoff,
grabdestination: state.grabdestination,
BASE_URL: state.BASE_URL
}
}
......@@ -445,6 +529,9 @@ const mapDispatchToProps = (dispacth) => {
type_pickup: type
}
}),
removeVoucher: () => dispacth({
type: ActionType.REMOVE_VOUCHER
}),
}
}
......
view/Home.js
View file @ b54398f3
......@@ -52,7 +52,7 @@ class Home extends React.Component {
this.loadAll()
}
loadAll(){
loadAll() {
this.CheckInbox()
const screenWidth = Math.round(Dimensions.get('window').width);
......@@ -95,7 +95,7 @@ class Home extends React.Component {
let params = Object.assign(requestParams, {
session_id: this.props.session_id,
})
Axios.post( this.props.BASE_URL + 'crm/v2/inbox/unread_count', params).then(respon => {
Axios.post(this.props.BASE_URL + 'crm/v2/inbox/unread_count', params).then(respon => {
let res = respon.data.unread_count
this.setState({
......@@ -188,7 +188,7 @@ class Home extends React.Component {
let params = Object.assign(requestParams, {
session_id: this.props.session_id,
})
this.setState({indicatorProfileCard: true})
this.setState({ indicatorProfileCard: true })
Axios.post(this.props.BASE_URL + 'crm/v2/member/get_profile', params).then(res => {
const dataCard = res.data
......@@ -274,10 +274,18 @@ class Home extends React.Component {
}
_pickup() {
let typeProps = {
type_pickup: true,
}
this.props.setTypePickup(typeProps);
this.props.navigation.navigate('Pickup Name', { from: 'home' });
}
_delivery() {
let typeProps = {
type_pickup: false,
}
this.props.setTypePickup(typeProps);
this.props.navigation.navigate('Delivery Address', { from: 'home' });
}
......@@ -296,9 +304,9 @@ class Home extends React.Component {
}
handleClaimCredit() {
this.setState({spinner: true})
this.setState({old_balance_claimed: true}) /** set jadi true dulu buat hilangkan bagian claim credit */
this.setState({indicatorProfileCard: true}) /** atau sekalian dibuat loading aja bagian profilecardnya */
this.setState({ spinner: true })
this.setState({ old_balance_claimed: true }) /** set jadi true dulu buat hilangkan bagian claim credit */
this.setState({ indicatorProfileCard: true }) /** atau sekalian dibuat loading aja bagian profilecardnya */
let params = Object.assign(requestParams, {
session_id: this.props.session_id,
......@@ -307,7 +315,7 @@ class Home extends React.Component {
console.log("start processing claim_old_balance")
Axios.post(this.props.BASE_URL + 'crm/v2/card/claim_old_balance', params).then(res => {
console.log("success processing claim_old_balance")
this.setState({spinner: false})
this.setState({ spinner: false })
this._account()
// Alert.alert(i18n.t('success'), i18n.t('alertclaimcredit'))
}).catch(error => {
......@@ -319,7 +327,7 @@ class Home extends React.Component {
response.msg,
[
{
text: 'OK', onPress: () => this.setState({spinner: false})
text: 'OK', onPress: () => this.setState({ spinner: false })
}
]
);
......@@ -563,7 +571,7 @@ class Home extends React.Component {
</View>
</View>
{/* <View style={styles.line2}></View> */}
<View style={{ flexDirection: 'row', flex: 1, display:'none' }}>
<View style={{ flexDirection: 'row', flex: 1, display: 'none' }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('point')} : </Text>
......@@ -621,7 +629,7 @@ class Home extends React.Component {
</View>
</View>
{/* <View style={styles.line2}></View> */}
<View style={{ flexDirection: 'row', flex: 1, display:'none' }}>
<View style={{ flexDirection: 'row', flex: 1, display: 'none' }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('point')} : </Text>
......@@ -686,7 +694,7 @@ class Home extends React.Component {
</View>
</View>
{/* <View style={styles.line2}></View> */}
<View style={{ flexDirection: 'row', flex: 1, display:'none' }}>
<View style={{ flexDirection: 'row', flex: 1, display: 'none' }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}>
<Text style={{ fontSize: 14, fontFamily: 'Gotham-Light' }}>{i18n.t('point')} : </Text>
</View>
......@@ -904,7 +912,14 @@ const mapDispatchToProps = (dispacth) => {
session_id: configProps.session_id
}
}),
setTypePickup: (typeProps) => dispacth({
type: ActionType.SET_TYPE,
data: {
type_pickup: typeProps.type_pickup
}
}),
}
}
......
view/MenuSelection.js
View file @ b54398f3
......@@ -273,7 +273,6 @@ class MenuSelection extends React.Component {
Alert.alert("", error.toString())
}
})
}
renderTabBar = ({ item }) => {
......
view/PickupName.js
View file @ b54398f3
......@@ -39,6 +39,64 @@ class PickupName extends React.Component {
}
handleVoucherSelect() {
//SPINNER ON
this.setState({
spinner: true,
})
//CEK TYPE TRANSAKSINYA DELIVERY OR PICKUP, DICEK UNTUK DI MASUKAN DI PARAMATER PEMANGGILAN API
let type_trans = ""
if (this.props.type_pickup == true) {
type_trans = 'Pickup'
} else {
type_trans = 'Delivery'
}
let params = {
session_id: this.props.session_id,
trans_type: type_trans,
order_item: this.props.order_item,
reward_id: this.props.voucher.id,
delivery_charge: this.props.grabamount,
}
// MULAI DISINI PEMANGGILAN API DI MULAI, KALAU BERHASIL SET VALUE VOUCHER NYA DAN SPINER DIMATIKAN, KALAU GAGAL CABUT SESSION VOUCHER DAN SPINNER DI MATIKAN
Axios.post(this.props.BASE_URL + 'crm/v2/reward/get_value', params).then(res => {
if (this.state.state_add_remove_voucher == true) {
this.setState({
state_add_remove_voucher: false
})
this.props.removeVoucher()
} else{
let voucherProps = {
value_voucher: res.data.reward,
voucher: res.data.reward
}
this.props.setVoucher(voucherProps);
}
this.setState({
spinner: false,
})
}).catch(error => {
try {
let response = error.response.data
Alert.alert("", response.msg)
this.setState({
spinner: false,
})
// FUNGSI REDUX UNTUK HAPUS VOUCHER
this.props.removeVoucher()
} catch (error) {
Alert.alert("", error.toString())
}
})
}
_getPermissions = async () => {
let { status } = await Permissions.askAsync(Permissions.LOCATION);
if (status !== 'granted') {
......@@ -70,6 +128,10 @@ class PickupName extends React.Component {
getOutletDetail(id, name, address) {
if (this.props.value_voucher !== "") {
this.handleVoucherSelect()
}else{
let OutletChange = {
outlet_id: id,
name_outlet: name,
......@@ -96,6 +158,8 @@ class PickupName extends React.Component {
}
}
}
getOutlet() {
this.setState({
spinner: true,
......@@ -192,12 +256,14 @@ class PickupName extends React.Component {
}
select(item) {
let OutletChange = {
outlet_id: item.id,
name_outlet: item.name,
}
this.props.setChangeOutletProps(OutletChange)
this.props.navigation.navigate('Home', { screen: 'MENU' });
}
......@@ -391,6 +457,9 @@ const mapDispatchToProps = (dispacth) => {
}
}),
removeVoucher: () => dispacth({
type: ActionType.REMOVE_VOUCHER
}),
}
}
......@@ -402,7 +471,30 @@ const mapStateToProps = (state) => {
name_outlet: state.name_outlet,
outlet_detailadress: state.outlet_detailadress,
language: state.language,
BASE_URL: state.BASE_URL
value_voucher: state.value_voucher,
voucher: state.voucher,
outlet_detailadress: state.outlet_detailadress,
home_address: state.home_address,
type_pickup: state.type_pickup,
value_voucher: state.value_voucher,
voucher: state.voucher,
session_id: state.session_id,
outlet_id: state.outlet_id,
name_outlet: state.name_outlet,
value_voucher: state.value_voucher,
voucher: state.voucher,
order_quantity: state.order_quantity,
order_total: state.order_total,
order_item: state.order_item,
quantity: state.quantity,
address: state.address,
addressId: state.addressId,
grabtype: state.grabtype,
grabamount: state.grabamount,
grabpickup: state.grabpickup,
grabdropoff: state.grabdropoff,
grabdestination: state.grabdestination,
BASE_URL: state.BASE_URL,
}
}
......
view/RewardDetail.js
View file @ b54398f3
......@@ -9,6 +9,7 @@ import requestParams from '../helper/requestParams';
import ActionType from '../redux/globalActionType';
import MyStatusBar from './MyStatusBar';
import i18n from 'i18n-js';
import Spinner from 'react-native-loading-spinner-overlay';
class RewardDetail extends React.Component {
constructor(props) {
......@@ -25,6 +26,7 @@ class RewardDetail extends React.Component {
value: '',
cur_time: '',
exp_time: '',
spinner: false
}
}
......@@ -33,11 +35,11 @@ class RewardDetail extends React.Component {
}
detailReward() {
let params = Object.assign(requestParams,{
let params = Object.assign(requestParams, {
session_id: this.props.session_id,
reward_id: this.props.route.params.rewardId
})
Axios.post(this.props.BASE_URL+'crm/v2/reward/get_detail', params).then(res => {
Axios.post(this.props.BASE_URL + 'crm/v2/reward/get_detail', params).then(res => {
let exp_time = new Date(res.data.reward.expire_time)
let cur_time = new Date()
......@@ -66,15 +68,63 @@ class RewardDetail extends React.Component {
}
useVoucher() {
let voucherProps = {
value_voucher: this.state.value,
voucher: this.state.value
handleVoucherSelect() {
//SPINNER ON
this.setState({
spinner: true,
})
//CEK TYPE TRANSAKSINYA DELIVERY OR PICKUP, DICEK UNTUK DI MASUKAN DI PARAMATER PEMANGGILAN API
let type_trans = ""
if (this.props.type_pickup == true) {
type_trans = 'Pickup'
} else {
type_trans = 'Delivery'
}
let params = {
session_id: this.props.session_id,
trans_type: type_trans,
order_item: this.props.order_item,
reward_id: this.props.route.params.rewardId,
delivery_charge: this.props.grabamount,
}
// MULAI DISINI PEMANGGILAN API DI MULAI, KALAU BERHASIL SET VALUE VOUCHER NYA DAN SPINER DIMATIKAN, KALAU GAGAL CABUT SESSION VOUCHER DAN SPINNER DI MATIKAN
Axios.post(this.props.BASE_URL + 'crm/v2/reward/get_value', params).then(res => {
let voucherProps = {
value_voucher: res.data.reward,
voucher: res.data.reward
}
this.props.setVoucher(voucherProps);
this.setState({
spinner: false,
})
this.props.navigation.navigate('Home', { screen: 'MENU' })
}).catch(error => {
try {
let response = error.response.data;
Alert.alert(
'',
response.msg,
[
{ text: "OK", onPress: () => this.setState({spinner: false}) }
],
);
// FUNGSI REDUX UNTUK HAPUS VOUCHER
this.props.removeVoucher()
} catch (error) {
Alert.alert("", error.toString())
}
})
}
useVoucher() {
this.handleVoucherSelect()
}
useDVoucher() {
......@@ -86,6 +136,7 @@ class RewardDetail extends React.Component {
console.log(this.state.content)
return (
<View style={styles.container}>
<Spinner visible={this.state.spinner} textContent={'Loading...'} textStyle={{ color: "white" }} />
<MyStatusBar />
<ScrollView>
<View style={styles.images}>
......@@ -250,6 +301,9 @@ const mapDispatchToProps = (dispacth) => {
}
}),
removeVoucher: () => dispacth({
type: ActionType.REMOVE_VOUCHER
}),
}
}
......@@ -260,6 +314,27 @@ const mapStateToProps = (state) => {
lat: state.lat,
long: state.long,
BASE_URL: state.BASE_URL,
outlet_detailadress: state.outlet_detailadress,
home_address: state.home_address,
type_pickup: state.type_pickup,
value_voucher: state.value_voucher,
voucher: state.voucher,
session_id: state.session_id,
outlet_id: state.outlet_id,
name_outlet: state.name_outlet,
value_voucher: state.value_voucher,
voucher: state.voucher,
order_quantity: state.order_quantity,
order_total: state.order_total,
order_item: state.order_item,
quantity: state.quantity,
address: state.address,
addressId: state.addressId,
grabtype: state.grabtype,
grabamount: state.grabamount,
grabpickup: state.grabpickup,
grabdropoff: state.grabdropoff,
grabdestination: state.grabdestination,
}
}
......
view/RewardSelect.js
View file @ b54398f3
......@@ -18,7 +18,9 @@ class RewardSelect extends React.Component {
}
componentDidMount() {
// console.log("INI URL NYA :"+this.props.BASE_URL);
console.log(" DATA PROPS : "+this.props.type_pickup);
this.getRewardsList()
this._unsubscribe = this.props.navigation.addListener('focus', () => {
this.getRewardsList()
......@@ -35,13 +37,12 @@ class RewardSelect extends React.Component {
// value_voucher: this.state.value,
// voucher: this.state.code
// }
// this.props.setVoucher(voucherProps);
// this.props.navigation.navigate('Home', { screen: 'MENU' })
// }
handleSelect(item) {
let type_trans = ""
if (this.props.type_pickup == true) {
type_trans = 'Pickup'
......@@ -56,7 +57,7 @@ class RewardSelect extends React.Component {
reward_id: item.id,
delivery_charge: this.props.grabamount,
}
console.log(params)
// console.log(params)
Axios.post(this.props.BASE_URL + 'crm/v2/reward/get_value', params).then(res => {
// console.log(res.data.reward)
let detail = res.data.reward
......
view/ShoppingCart.js
View file @ b54398f3
......@@ -88,15 +88,12 @@ class ShoppingCart extends React.Component {
}
checkChangeTrans(val) {
if (val == 'delivery') {
// let typeProps = {
// type_pickup: false,
// }
// this.props.setTypePickup(typeProps);
if (this.props.value_voucher !== "") {
this.handleVoucherSelect()
}
this.setState({
checkedBalance: false,
checkedPoint: false,
......@@ -105,15 +102,20 @@ class ShoppingCart extends React.Component {
balanceused: 0
})
let typeProps = {
type_pickup: false,
}
this.props.setTypePickup(typeProps);
this.props.navigation.navigate("Delivery Address", { from: 'shoppingCart' })
} else {
// let typeProps = {
// type_pickup: true,
// }
// this.props.setTypePickup(typeProps);
if (this.props.value_voucher !== "") {
this.handleVoucherSelect()
let typeProps = {
type_pickup: true,
}
this.props.setTypePickup(typeProps);
this.setState({
checkedBalance: false,
checkedPoint: false,
......@@ -122,6 +124,7 @@ class ShoppingCart extends React.Component {
balanceused: 0
})
this.props.navigation.navigate('Pickup Name', { from: 'shoppingCart' })
}
}
......@@ -158,13 +161,18 @@ class ShoppingCart extends React.Component {
state_add_remove_voucher: false
})
this.props.removeVoucher()
this.setState({
spinner: false,
})
} else{
let voucherProps = {
value_voucher: res.data.reward,
voucher: res.data.reward
}
this.props.setVoucher(voucherProps);
this.setState({
spinner: false,
})
}
this.setState({
......@@ -174,10 +182,11 @@ class ShoppingCart extends React.Component {
}).catch(error => {
try {
let response = error.response.data
Alert.alert("", response.msg)
this.setState({
spinner: false,
})
console.log("RESPONSE : "+ response)
// Alert.alert("", response.msg)
// this.setState({
// spinner: false,
// })
// FUNGSI REDUX UNTUK HAPUS VOUCHER
this.props.removeVoucher()
} catch (error) {
......@@ -187,7 +196,6 @@ class ShoppingCart extends React.Component {
}
handleRemoveVoucher() {
//panggil spiner
if (this.props.value_voucher !== "") {
......@@ -204,9 +212,7 @@ class ShoppingCart extends React.Component {
balanceused: 0,
state_add_remove_voucher: true
})
// this.props.removeVoucher()
}
handleAddVoucher() {
......
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