Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

lib/en.json

@@ -223,7 +223,7 @@
     "alertDeleteItemTitle": "Delete item",
     "alertDeleteItemContent": "Are you sure want to delete item?",
     "alertSelectOrderFirst": "Please choose your order first",
-    "alertBalanceNotEnoughtWithVooucher": "Rewards cannot be used, your minimum transaction is not enough",
+    "alertBalanceNotEnoughtWithVooucher": " cannot be used, your order has not reached the required minimum transaction of Rp. ",
     "alertSuccessTransaction": "Transaction success",
     "updateVersion": "Please update your Excelso App first!",
     "upgradePremiumRespon": "Your premium account upgrade request will require maximum 24 hours to process",

lib/id.json

@@ -223,7 +223,7 @@
   "alertDeleteItemTitle": "Hapus item",
   "alertDeleteItemContent": "Anda yakin ingin menghapus item?",
   "alertSelectOrderFirst":"Silahkan pilih pesanan Anda terlebih dahulu",
-  "alertBalanceNotEnoughtWithVooucher":"Reward tidak bisa dipakai karena pesanan belum mencapai minimum transaksi yang dibutuhkan",
+  "alertBalanceNotEnoughtWithVooucher":" tidak bisa dipakai karena pesanan belum mencapai minimum transaksi yang dibutuhkan yaitu Rp. ",
   "alertSuccessTransaction":"Transaksi Berhasil",
   "updateVersion":"Mohon update aplikasi Anda terlebih dahulu!",
   "upgradePremiumRespon":"Permintaan upgrade akun anda ke Premium sudah kami terima dan akan diproses dalam 1x24 jam",

view/ShoppingCart.js

 import React from 'react';
-import { View, Text, TextInput, StyleSheet, Button, TouchableOpacity, ScrollView, FlatList, Image, Alert, ActivityIndicator, TouchableWithoutFeedback } from 'react-native';
+import { View, Text, TextInput, StyleSheet, Button, TouchableOpacity, ScrollView, FlatList, Image, Alert, ActivityIndicator } from 'react-native';
 import { connect } from 'react-redux'
 import CheckBox from 'react-native-check-box'
 import { Card } from 'react-native-shadow-cards'
@@ -617,7 +617,7 @@ class ShoppingCart extends React.Component {
             Alert.alert('Error', i18n.t('alertselectpayment'))
         } else if (this.props.value_voucher !== '') {
             if (parseInt(this.props.value_voucher.reward.min_transaction) > parseInt(this.props.order_total)) {
-                Alert.alert('', i18n.t('alertBalanceNotEnoughtWithVooucher'))
+                Alert.alert('', this.props.value_voucher.reward.title + i18n.t('alertBalanceNotEnoughtWithVooucher') + this.props.value_voucher.reward.min_transaction.toString().replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"))
             } else {
                 this.props.navigation.navigate('CONFIRM YOUR ORDER', { balanceUsed: this.state.balanceused, pointused: this.state.pointsused })
             }