Explorar o código

Update summary receipt page

vbea hai 1 ano
pai
achega
1e90c93ac0

+ 1 - 0
Strides-APP/app/i18n/locales/en.js

@@ -383,6 +383,7 @@ export default {
     labelReferenceId: "Reference ID:",
     labelReservationFee: "Reservation Fee:",
     labelResultingBalance: "Resulting Balance:",
+    labelRefundAmount: "Refund Amount:",
     labelStationId: "Station ID: ",
     labelSubtotal: "Subtotal",
     labelTransactionId: "Transaction ID: ",

+ 1 - 0
Strides-APP/app/i18n/locales/zh-TW.js

@@ -383,6 +383,7 @@ export default {
     labelReferenceId: "關聯編號:",
     labelReservationFee: "預訂費用:",
     labelResultingBalance: "當前餘額:",
+    labelRefundAmount: "退款金額:",
     labelStationId: "站點編號:",
     labelSubtotal: "小計",
     labelTransactionId: "交易編號:",

+ 1 - 0
Strides-APP/app/i18n/locales/zh.js

@@ -383,6 +383,7 @@ export default {
     labelReferenceId: "关联编号:",
     labelReservationFee: "预订费用:",
     labelResultingBalance: "当前余额:",
+    labelRefundAmount: "退款金额:",
     labelStationId: "站点编号:",
     labelSubtotal: "小计",
     labelTransactionId: "交易编号:",

+ 20 - 9
Strides-APP/app/pages/chargeV2/SummaryV2.js

@@ -336,20 +336,31 @@ export default class SummaryV2 extends Component {
                 <Text style={styles.label}>{$t('wallet.labelChargeRates')}</Text>
                 <Text style={styles.text}>{currency}{this.state.summaryInfo.chargeRates ?? '0.0'}</Text>
               </View> */}
-              <View style={styles.formRow}>
-                <TextView style={styles.label}>{$t('wallet.labelExchangeRate')}</TextView>
-                <TextView style={styles.text}>{this.state.summaryInfo.payment.exchangeRate ?? "-"}</TextView>
-              </View>
+              { utils.isNotEmpty(this.state.summaryInfo.payment.exchangeRate) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelExchangeRate')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.exchangeRate ?? "-"}</TextView>
+                </View>
+              }
               {/* <View style={styles.formRow}>
                 <Text style={styles.label}>{$t('wallet.labelPreviousBalance')}</Text>
                 <Text style={styles.text}>{this.getSummaryText(this.state.summaryInfo.previousBalance)}</Text>
               </View> */}
-              <View style={styles.formRow}>
-                <TextView style={styles.label}>{$t('wallet.labelResultingBalance')}</TextView>
-                <TextView style={styles.text}>{this.state.summaryInfo.payment.resultingBalance ?? "-"}</TextView>
-              </View>
+              { utils.isNotEmpty(this.state.summaryInfo.payment.resultingBalance) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelResultingBalance')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.resultingBalance ?? "-"}</TextView>
+                </View>
+              }
+              { utils.isNotEmpty(this.state.summaryInfo.payment.refundAmount) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelRefundAmount')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.refundAmount ?? "-"}</TextView>
+                </View>
+              }
             </View>
           }
+          <EndView/>
           { (this.state.isActully && utils.isNotEmpty(this.state.summaryInfo.top)) &&
             <View style={styles.bottomButton}>
               <TextView
@@ -459,7 +470,7 @@ const styles = StyleSheet.create({
     ...ui.underline
   },
   bottomButton: {
-    marginTop: 32,
+    marginTop: 16,
     marginBottom: 16
   },
   tipText: {

+ 20 - 9
Strides-APP/app/pages/chargeV2/SummaryV3.js

@@ -340,16 +340,27 @@ export default class SummaryV3 extends Component {
                   <TextView style={styles.text}>{this.state.summaryInfo.payment.finalPayment ?? "-"}</TextView>
                 </View>
               }
-              <View style={styles.formRow}>
-                <TextView style={styles.label}>{$t('wallet.labelExchangeRate')}</TextView>
-                <TextView style={styles.text}>{this.state.summaryInfo.payment.exchangeRate ?? "-"}</TextView>
-              </View>
-              <View style={styles.formRow}>
-                <TextView style={styles.label}>{$t('wallet.labelResultingBalance')}</TextView>
-                <TextView style={styles.text}>{this.state.summaryInfo.payment.resultingBalance ?? "-"}</TextView>
-              </View>
+              { utils.isNotEmpty(this.state.summaryInfo.payment.exchangeRate) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelExchangeRate')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.exchangeRate ?? "-"}</TextView>
+                </View>
+              }
+              { utils.isNotEmpty(this.state.summaryInfo.payment.resultingBalance) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelResultingBalance')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.resultingBalance ?? "-"}</TextView>
+                </View>
+              }
+              { utils.isNotEmpty(this.state.summaryInfo.payment.refundAmount) &&
+                <View style={styles.formRow}>
+                  <TextView style={styles.label}>{$t('wallet.labelRefundAmount')}</TextView>
+                  <TextView style={styles.text}>{this.state.summaryInfo.payment.refundAmount ?? "-"}</TextView>
+                </View>
+              }
             </View>
           }
+          <EndView/>
           { (this.state.isActully && utils.isNotEmpty(this.state.summaryInfo.top)) &&
             <View style={styles.bottomButton}>
               <TextView
@@ -459,7 +470,7 @@ const styles = StyleSheet.create({
     ...ui.underline
   },
   bottomButton: {
-    marginTop: 32,
+    marginTop: 16,
     marginBottom: 16
   },
   tipText: {