esoftplay-event 0.0.2-u → 0.0.2-v

package/event/order_detail_upgrade.tsx

@@ -114,7 +114,7 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
                 <EventHtmltext allowFontScaling={false} style={{ flexWrap: 'wrap', fontFamily: "Arial", fontSize: 11, fontStyle: "normal", letterSpacing: 0, color: '#999' }}>{item.info}</EventHtmltext>
               }
             </View>
-            <Text allowFontScaling={false} style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', marginTop: 5, color: item.status != 1 ? "#c9c9c9" : selTic ? LibStyle.colorBlue : "#000" }}>{"+ " + LibUtils.money(item?.amount_difference, item?.currency)}</Text>
+            <Text allowFontScaling={false} style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', marginTop: 5, color: item.status != 1 ? "#c9c9c9" : selTic ? LibStyle.colorBlue : "#000" }}>{"+ "}{item?.is_remainer == "0" ? LibUtils.money(item?.price_difference, item?.currency) : LibUtils.money(item?.amount_difference, item?.currency)}</Text>
 
           </View>
         </View>

package/event/order_detail_upgrade_payment.tsx

@@ -111,7 +111,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
     return (percent * amount) / 100
   }
 
-  const price = Number(selectedTicket?.selected_ticket?.price_to)
+  const price = Number(selectedTicket?.selected_ticket?.price_to || selectedTicket?.selected_ticket?.amount_difference)
   const qty = Number(dataTicket?.qty_upgrade)
 
   const calculate = PaymentFee_calculate(price, qty,

package/event/order_reschedule.tsx

@@ -291,7 +291,7 @@ export default function m(props: EventOrder_rescheduleProps): any {
                       </View>
                     </View>
                     <View style={applyStyle({ marginLeft: 10, flexDirection: 'column', marginRight: 6 })} >
-                      <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, textAlign: "right", color: _selectTicket ? "#3ea4dc" : '#999', opacity: opacityPassed })} >{LibUtils.money(item1.price, item1.currency)}</Text>
+                      {/* <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, textAlign: "right", color: _selectTicket ? "#3ea4dc" : '#999', opacity: opacityPassed })} >{LibUtils.money(item1.price, item1.currency)}</Text> */}
                     </View>
 
                     <TouchableOpacity onPress={() => {
@@ -313,7 +313,7 @@ export default function m(props: EventOrder_rescheduleProps): any {
     )
   }
 
-  esp.log(result);
+  // esp.log(result);
   function renderRefundList(item: any, i: number) {
     let _selectTicket = item.hasOwnProperty('check') && item.check == 1
     const styleID_12nkjf: any = { marginLeft: 10, textDecorationLine: 'line-through', textDecorationStyle: 'solid', opacity: item.is_refundable == 1 ? 1 : 0.5, marginTop: 4, fontFamily: "Arial", fontSize: 12, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : '#999' }
@@ -335,7 +335,7 @@ export default function m(props: EventOrder_rescheduleProps): any {
             <Text allowFontScaling={false} style={{ opacity: item.is_refundable == 1 ? 1 : 0.5, fontFamily: "Arial", fontSize: 10, marginBottom: 4, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0.23, color: LibStyle.colorRed }}>{item.refund == "0.00" ? esp.lang("event/order_reschedule", "cant_refund") : esp.lang("event/order_reschedule", "refundable", LibUtils.numberAbsolute(item.refund).toString())}</Text>
             <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 14, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : '#999' })}>{esp.lang("ticket/refund", "ticket")} {item.price_name + " (" + item.qty + " " + esp.lang("ticket/refund", "ticket") + ") "}</Text>
             <View style={{ flexDirection: 'row', alignContent: 'center', alignItems: 'center' }}>
-              <Text allowFontScaling={false} style={applyStyle({ marginTop: 4, fontFamily: "Arial", fontSize: 12, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : '#999' })}>{LibUtils.money(item.price_cancellable, item.currency)}</Text>
+              <Text allowFontScaling={false} style={applyStyle({ marginTop: 4, fontFamily: "Arial", fontSize: 12, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : '#999' })}>{LibUtils.money(item.total, item.currency)}</Text>
               {
                 item.refund != "0.00" && item.refund != "100.00" &&
                 <Text allowFontScaling={false} style={styleID_12nkjf}>{LibUtils.money(item.price)}</Text>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay-event",
-  "version": "0.0.2-u",
+  "version": "0.0.2-v",
   "description": "event module on esoftplay framework",
   "main": "index.js",
   "scripts": {