penambahan parameter pada API

helper/requestParams.js

+import Constants from 'expo-constants';
+import * as Device from 'expo-device'; 
+
+export default requestParams = {
+    device_id: Constants.deviceId,
+    os_name: Device.osName,
+    os_version: Device.osVersion,
+    app_version: Constants.manifest.version,
+    build_number: Constants.manifest.extra.buildNumber
+}
\ No newline at end of file

view/Account.js

@@ -29,6 +29,7 @@ import Constants from 'expo-constants';
 import Toast from 'react-native-tiny-toast';
 import i18n from 'i18n-js';
 import NumberFormat from 'react-number-format';
+import requestParams from '../helper/requestParams';
 
 class Account extends React.Component {
     constructor(props) {
@@ -127,9 +128,9 @@ class Account extends React.Component {
     }
 
     handleClaimCredit() {
-        let params = {
-            session_id: this.props.session_id
-        }
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
         Axios.post(this.props.BASE_URL + 'crm/v2/card/claim_old_balance', params).then(res => {
             Alert.alert(i18n.t('success'), i18n.t('alertclaimcredit'))
         }).catch(error => {
@@ -139,13 +140,12 @@ class Account extends React.Component {
     }
 
     _getProfile() {
-        let params = {
+        let params = Object.assign(requestParams,{
             session_id: this.props.session_id,
             lat: this.state.my_lat,
             long: this.state.my_long,
             closest_outlet: 1
-
-        }
+          })
        
         Axios.post(this.props.BASE_URL + 'crm/v2/member/get_profile', params).then(res => {
             console.log("INI DATANYA : " +JSON.stringify(res))
@@ -233,9 +233,9 @@ class Account extends React.Component {
     }
 
     handleuseBalance() {
-        let params = {
-            session_id: this.props.session_id
-        }
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
         Axios.post(this.props.BASE_URL + 'crm/v2/point/check', params).then(res => {
             if (res.data.in_process_redeem == false) {
                 this.props.navigation.navigate('UseBalance')

view/Auth.js

@@ -164,11 +164,16 @@ class Auth extends React.Component {
     i18n.locale = this.props.language;
   }
 
+  componentDidMount(){
+    console.log("INI"+this.props.pageEmailConfirmation)
+  }
+
 
   render() {
     return (
       <Stack.Navigator>
         {
+
           this.props.session_id === '' ? (
             <>
               <Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />

view/EmailConfirmation.js

@@ -21,7 +21,8 @@ class EmailConfirmation extends React.Component {
     }
 
     componentDidMount() {
-        console.log("SESSION   " + this.props.pageEmailConfirmation)
+        console.log("EMAIL KONFIRMATISI" + this.props.pageEmailConfirmation)
+        console.log("EMAIL proses" + this.props.proses)
     }
 
     handleSubmit() {
@@ -29,12 +30,11 @@ class EmailConfirmation extends React.Component {
             spinner: true,
         })
         // console.log(this.props.isEmailverif)
-        if (this.props.isEmailverif === true) {
+        if (this.props.isEmailverif == true) {
             let pageProps = {
                 pageEmailConfirmation: false
             }
             this.props.setPage(pageProps)
-            // console.log('hai ini gue kalau ada device yang sama!')
     
             let params = {
                 "session_id": this.props.session_id,
@@ -60,6 +60,10 @@ class EmailConfirmation extends React.Component {
 
                 // console.log('LOGIN PROPS : ' + JSON.stringify(loginProps))
 
+                let pageProps = {
+                    pageEmailConfirmation: false
+                }
+                this.props.setPage(pageProps)
                 this.props.setLoginInfo(loginProps)
                 this.props.setEmailConfirm(emailConfirmProps)
                 this.setState({
@@ -84,7 +88,7 @@ class EmailConfirmation extends React.Component {
         } else {
 
             let pageProps = {
-                pageEmailConfirmation: false
+                pageEmailConfirmation: true
             }
             this.props.setPage(pageProps)
             let paramater = {
@@ -316,7 +320,8 @@ const mapStateToProps = (state) => {
         pageEmailConfirmation: state.pageEmailConfirmation,
         proses: state.proses,
         language: state.language,
-        BASE_URL: state.BASE_URL
+        BASE_URL: state.BASE_URL,
+        proses: state.proses
     }
 }
 

view/Home.js

@@ -17,15 +17,16 @@ import i18n from 'i18n-js';
 import { Badge } from 'react-native-elements';
 import NumberFormat from 'react-number-format';
 import { Button } from 'native-base';
+import Constants from 'expo-constants';
+import requestParams from '../helper/requestParams';
 
-let version = info.expo.version
-let buildNumber = info.expo.android.versionCode
 
 class Home extends React.Component {
   
 
   constructor(props) {
     super(props);
+
     this.state = {
       data_baner: [],
       images: [],
@@ -48,8 +49,6 @@ class Home extends React.Component {
     }
   }
 
-  
-
   componentDidMount() {
 
     this.CheckInbox()
@@ -90,9 +89,9 @@ class Home extends React.Component {
   }
 
   CheckInbox() {
-    let params = {
-      session_id: this.props.session_id
-    }
+    let params = Object.assign(requestParams,{
+      session_id: this.props.session_id,
+    })
     Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/inbox/unread_count', params).then(respon => {
       let res = respon.data.unread_count
 
@@ -153,6 +152,7 @@ class Home extends React.Component {
       let imageLink = []
       let slugs = []
 
+
       for (let i = 0; i < dataCarousell.length; i++) {
         const element = dataCarousell[i];
         imageLink.push(element.title_thumb)
@@ -172,12 +172,11 @@ class Home extends React.Component {
   }
 
   _account() {
-    let params = {
+    let params = Object.assign(requestParams,{
       session_id: this.props.session_id,
-    }
-    // console.log(params);
+    })
+   
     Axios.post(this.props.BASE_URL + 'crm/v2/member/get_profile', params).then(res => {
-      console.log("data" + JSON.stringify(res))
       const dataCard = res.data
       let point = dataCard.kaspro_point
       let balance = dataCard.kaspro_balance
@@ -209,15 +208,15 @@ class Home extends React.Component {
   }
 
   _getOutletClosest() {
-    let params = {
+
+    let params = Object.assign(requestParams,{
       session_id: this.props.session_id,
       lat: this.state.my_lat,
-      long: this.state.my_long
-    }
-    // console.log(params);
-    Axios.post(this.props.BASE_URL + 'crm/v2/outlet/get_closest', params).then(res => {
-      // console.log(res.data.data)
+      long: this.state.my_long,
+    })
    
+    console.log("INI DATANYA "+ JSON.stringify(params));
+    Axios.post(this.props.BASE_URL + 'crm/v2/outlet/get_closest', params).then(res => {
       let outletId = res.data.data.outlet_id
       let outletName = res.data.data.outlet_name
       let outletAddress = res.data.data.outlet_address
@@ -239,9 +238,9 @@ class Home extends React.Component {
   }
 
   handleuseBalance() {
-    let params = {
-      session_id: this.props.session_id
-    }
+    let params = Object.assign(requestParams,{
+      session_id: this.props.session_id,
+    })
     Axios.post(this.props.BASE_URL + 'crm/v2/point/check', params).then(res => {
       if (res.data.in_process_redeem == false) {
         this.props.navigation.navigate('UseBalance')
@@ -277,9 +276,9 @@ class Home extends React.Component {
   }
 
   handleClaimCredit() {
-    let params = {
-      session_id: this.props.session_id
-    }
+    let params = Object.assign(requestParams,{
+      session_id: this.props.session_id,
+    })
     Axios.post(this.props.BASE_URL + 'crm/v2/card/claim_old_balance', params).then(res => {
       Alert.alert(i18n.t('success'), i18n.t('alertclaimcredit'))
       this.componentDidMount()
@@ -289,10 +288,6 @@ class Home extends React.Component {
     })
   }
 
-<<<<<<< HEAD
-  
-=======
->>>>>>> ec44f1258a343da5f41e3439f3f9aeeaa56bb661
   onClickClaimCredit() {
     Alert.alert(
       "",
@@ -660,16 +655,6 @@ class Home extends React.Component {
                       <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('topup')}</Text>
                     </View>
                   </TouchableOpacity>
-<<<<<<< HEAD
-                </View>
-                <View style={{ justifyContent: 'center', flex: 1 }}>
-                  <TouchableOpacity onPress={() => this.onClickClaimCredit()}>
-                    <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', marginRight: 20, marginLeft: 20, justifyContent: 'center' }}>
-                      <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 14 }}>{i18n.t('usebalance')}</Text>
-                    </View>
-                  </TouchableOpacity>
-                </View>
-=======
                 </View>
                 <View style={{ justifyContent: 'center', flex: 1 }}>
                   <TouchableOpacity onPress={() => this.onClickClaimCredit()}>
@@ -678,7 +663,6 @@ class Home extends React.Component {
                     </View>
                   </TouchableOpacity>
                 </View>
->>>>>>> ec44f1258a343da5f41e3439f3f9aeeaa56bb661
               </View>
               <View style={{ height: 40 }}></View>
             </View>

view/InboxDetail.js

@@ -8,6 +8,7 @@ import { connect } from 'react-redux';
 import i18n from 'i18n-js';
 import { FontAwesome, AntDesign } from '@expo/vector-icons';
 import Toast from 'react-native-tiny-toast';
+import requestParams from '../helper/requestParams';
 
 class InboxDetail extends React.Component {
     constructor(props) {
@@ -38,10 +39,11 @@ class InboxDetail extends React.Component {
     }
 
     getInboxDetail() {
-        let params = {
+
+        let params = Object.assign(requestParams, {
             session_id: this.props.session_id,
             message_id: this.props.route.params.idInbox
-        }
+        })
 
         // console.log(params)
 
@@ -87,11 +89,11 @@ class InboxDetail extends React.Component {
     }
 
     deleteInbox() {
-        let params = {
+      
+        let params = Object.assign(requestParams, {
             session_id: this.props.session_id,
             message_id: this.props.route.params.idInbox
-        }
-
+        })
         // console.log(params)
 
         Axios.post(this.props.BASE_URL + 'crm/v2/inbox/delete', params).then(res => {

view/InboxList.js

@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import Axios from 'axios';
 import i18n from 'i18n-js';
 import moment from 'moment'
-
+import requestParams from '../helper/requestParams';
 
 class InboxList extends React.Component {
 
@@ -51,9 +51,10 @@ class InboxList extends React.Component {
     }
 
     getInbox() {
-        let params = {
-            session_id: this.props.session_id
-        }
+        
+        let params = Object.assign(requestParams, {
+            session_id: this.props.session_id,
+        })
         Axios.post(this.props.BASE_URL + 'crm/v2/inbox/get_list', params).then(res => {
             let data = res.data.messages
             // console.log(data)

view/Login.js

@@ -180,7 +180,7 @@ class Login extends React.Component {
                 }
 
                 let prosesProps = {
-                    proses: ''
+                    proses: 'emailconfirm'
                 }
 
                 let pageProps = {
@@ -225,13 +225,13 @@ class Login extends React.Component {
                     }
 
                     this.props.setProses(prosesProps);
-
                     this.props.setLoginInfo(loginProps)
                     this.props.setEmailConfirm(emailConfirmProps)
                     this.props.setPage(pageProps)
                     this.setState({
                         spinner: false,
                     })
+
                     this.props.navigation.navigate('Email Confirmation')
 
                 } else {

view/MenuSelection.js

@@ -12,6 +12,8 @@ import * as Permissions from 'expo-permissions';
 import * as Device from 'expo-device';
 import NumberFormat from 'react-number-format';
 import i18n from 'i18n-js';
+import Constants from 'expo-constants';
+import requestParams from '../helper/requestParams';
 
 class MenuSelection extends React.Component {
   constructor(props) {
@@ -94,11 +96,12 @@ class MenuSelection extends React.Component {
   }
 
   _getOutletClosest() {
-    let params = {
+
+    let params = Object.assign(requestParams,{
       session_id: this.props.session_id,
       lat: this.state.my_lat,
       long: this.state.my_long
-    }
+    })
     // console.log(params);
     Axios.post(this.props.BASE_URL+'crm/v2/outlet/get_closest', params).then((res) => {
 
@@ -122,9 +125,10 @@ class MenuSelection extends React.Component {
   }
 
   getMenuList() {
-    let params = {
+    
+    let params = Object.assign(requestParams,{
       outlet_id: this.props.outlet_id
-    }
+    })
     // console.log("INI YA " + params)
     Axios.post(this.props.BASE_URL+'crm/v2/menu/get_list', params).then(res => {
 
@@ -392,7 +396,10 @@ const mapStateToProps = (state) => {
     quantity: state.quantity,
     address: state.address,
     menu_item: state.menu_item,
-    language: state.language
+    language: state.language,
+    os_version: state.os_version,
+    os_name: state.os_name,
+    app_version: state.app_version,
   }
 }
 

view/New_Register.js

@@ -10,6 +10,7 @@ import Spinner from 'react-native-loading-spinner-overlay';
 // import { connect } from 'react-redux';
 import RNPickerSelect from 'react-native-picker-select';
 import MyStatusBar from './MyStatusBar';
+import requestParams from '../helper/requestParams';
 
 
 var date = [
@@ -32,7 +33,7 @@ class NewRegister extends React.Component {
     constructor(props) {
         super(props);
         this.state = ({
-            caretHidden:true,
+            caretHidden: true,
             email: "",
             password: "",
             full_name: "",
@@ -57,7 +58,7 @@ class NewRegister extends React.Component {
 
     componentDidMount() {
         this.load_data();
-        console.log("INI YA : "+this.props.BASE_URL)
+        console.log("INI YA : " + this.props.BASE_URL)
 
         let date_list = []
         for (let i = 1; i <= 31; i++) {
@@ -83,7 +84,7 @@ class NewRegister extends React.Component {
     }
 
     load_data() {
-        return Axios.get(this.props.BASE_URL+'crm/v2/auth/register_get_enum').then(res => {
+        return Axios.get(this.props.BASE_URL + 'crm/v2/auth/register_get_enum').then(res => {
             // console.log('ini res enum nya : ' + JSON.stringify(res));
             const data_enum = res.data;
             const list_gender = data_enum.gender
@@ -195,7 +196,8 @@ class NewRegister extends React.Component {
         this.setState({
             spinner: true,
         })
-        let parameter = {
+
+        let params = Object.assign(requestParams, {
             "email": this.state.email,
             "password": this.state.password,
             "name": this.state.full_name,
@@ -203,14 +205,12 @@ class NewRegister extends React.Component {
             "dob_year": this.state.dob_year.toString(),
             "dob_month": this.state.dob_month.toString(),
             "dob_day": this.state.dob_day.toString(),
-            // "confirmation_number": this.state.confirmation_number,
-            // "mobile_phone": this.state.no_hp,
-            // "profession": this.state.profession,
-            // "domicile": this.state.domicilie,
-        }
+
+        })
+
 
         // console.log(parameter);
-        Axios.post(this.props.BASE_URL+'crm/v2/auth/register', parameter).then(res => {
+        Axios.post(this.props.BASE_URL + 'crm/v2/auth/register', params).then(res => {
             // console.log(res);
             let registerProps = {
                 email: this.state.email,
@@ -283,7 +283,7 @@ class NewRegister extends React.Component {
                             <View style={styles.items2}>
                                 <TextInput
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})}
+                                    onFocus={() => this.setState({ caretHidden: false })}
                                     style={styles.textInput}
                                     onChangeText={(email) => this.setState({ email })}
                                     value={this.state.email}
@@ -304,7 +304,7 @@ class NewRegister extends React.Component {
                             <View style={styles.items2}>
                                 <TextInput
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})}
+                                    onFocus={() => this.setState({ caretHidden: false })}
                                     style={styles.textInput}
                                     onChangeText={(password) => this.setState({ password })}
                                     value={this.state.password}
@@ -324,7 +324,7 @@ class NewRegister extends React.Component {
                                 <TextInput
                                     style={styles.textInput}
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})}
+                                    onFocus={() => this.setState({ caretHidden: false })}
                                     onChangeText={(confirm_pass) => this.setState({ confirm_pass })}
                                     value={this.state.confirm_pass}
                                     secureTextEntry={true}
@@ -343,7 +343,7 @@ class NewRegister extends React.Component {
                                 <TextInput
                                     style={styles.textInput}
                                     caretHidden={this.state.caretHidden}
-                                    onFocus={() => this.setState({caretHidden: false})}
+                                    onFocus={() => this.setState({ caretHidden: false })}
                                     onChangeText={(full_name) => this.setState({ full_name })}
                                     value={this.state.full_name}
                                     placeholder='Example'

view/OrderDetail.js

@@ -11,6 +11,7 @@ import { FontAwesome } from '@expo/vector-icons';
 import { Icon } from 'react-native-elements'
 import MyStatusBar from './MyStatusBar';
 import i18n from 'i18n-js';
+import requestParams from '../helper/requestParams';
 
 class OrderDetail extends React.Component {
 
@@ -87,11 +88,11 @@ class OrderDetail extends React.Component {
 
     handleOrderCancel() {
 
-        let params = {
+        let params = Object.assign(requestParams,{
             session_id: this.props.session_id,
             transaction_id: this.props.route.params.idTrans,
             reason: "Cancelled By User"
-        }
+          })
         // console.log(params)
         Axios.post(this.props.BASE_URL + 'crm/v2/transaction/cancel', params).then(res => {
             let respon = res.data.status
@@ -108,10 +109,10 @@ class OrderDetail extends React.Component {
     }
 
     getDetailTrans() {
-        let params = {
+        let params = Object.assign(requestParams,{
             session_id: this.props.session_id,
             transaction_id: this.props.route.params.idTrans
-        }
+          })
         // console.log("PARAMETER : " + JSON.stringify(params))
         Axios.post(this.props.BASE_URL + 'crm/v2/transaction/detail', params).then(res => {
             let data = res.data

view/Outlets.js

@@ -15,6 +15,7 @@ import RNPickerSelect from 'react-native-picker-select';
 import MapView, { PROVIDER_GOOGLE, Marker } from 'react-native-maps';
 import { Icon } from 'react-native-elements';
 import i18n from 'i18n-js';
+import requestParams from '../helper/requestParams';
 
 
 class Outlets extends React.Component {
@@ -92,9 +93,9 @@ class Outlets extends React.Component {
         this.setState({
             spinner: true,
         })
-        let params = {
-            session_id: this.props.session_id
-        }
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
 
         Axios.post(this.props.BASE_URL+"crm/v2/outlet/get_list", params).then(res => {
             let dataOutlets = res.data.outlets;

view/RewardDetail.js

@@ -9,6 +9,7 @@ import ActionType from '../redux/globalActionType';
 import moment from 'moment';
 import { Button } from 'react-native-elements';
 import MyStatusBar from './MyStatusBar';
+import requestParams from '../helper/requestParams';
 
 class RewardDetail extends React.Component {
     constructor(props) {
@@ -40,11 +41,10 @@ class RewardDetail extends React.Component {
     }
 
     detailReward() {
-
-        let params = {
+        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 => {
 
 

view/RewardHistory.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import Axios from 'axios';
 import moment from 'moment'
 import i18n from 'i18n-js';
+import requestParams from '../helper/requestParams';
 
 class RewardHistory extends React.Component {
     constructor(props) {
@@ -28,9 +29,10 @@ class RewardHistory extends React.Component {
     }
 
     getRewardsList() {
-        let params = {
-            session_id: this.props.session_id
-        }
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
+          
         Axios.post(this.props.BASE_URL+'crm/v2/reward/history', params).then(res => {
             let data = res.data.rewards
             // console.log(data)

view/RewardSelect.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import Axios from 'axios';
 import moment from 'moment'
 import ActionType from '../redux/globalActionType';
+import requestParams from '../helper/requestParams';
 
 class RewardSelect extends React.Component {
     constructor(props) {
@@ -40,10 +41,10 @@ class RewardSelect extends React.Component {
     // }
 
     handleSelect(item) {
-        let params = {
+        let params = Object.assign(requestParams,{
             session_id: this.props.session_id,
             reward_id: item.id
-        }
+          })
         Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/reward/get_detail', params).then(res => {
             // console.log(res.data.reward)
             let detail = res.data.reward
@@ -61,9 +62,10 @@ class RewardSelect extends React.Component {
         })
     }
     getRewardsList() {
-        let params = {
-            session_id: this.props.session_id
-        }
+
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
         Axios.post('https://excelsocrm.ravintoladev.com/crm/v2/reward/get_list', params).then(res => {
             let data = res.data.rewards
             // console.log(data)

view/RewardsList.js

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import Axios from 'axios';
 import moment from 'moment'
 import i18n from 'i18n-js';
+import requestParams from '../helper/requestParams';
 
 class RewardsList extends React.Component {
     constructor(props) {
@@ -32,9 +33,9 @@ class RewardsList extends React.Component {
     }
 
     getRewardsList() {
-        let params = {
-            session_id: this.props.session_id
-        }
+        let params = Object.assign(requestParams,{
+            session_id: this.props.session_id,
+          })
         Axios.post(this.props.BASE_URL+'crm/v2/reward/get_list', params).then(res => {
             let data = res.data.rewards
             // console.log(data)

view/ShoppingCart.js

@@ -328,10 +328,6 @@ class ShoppingCart extends React.Component {
         }
     }
 
-
-
-
-
     getRate() {
 
         let params = {