esoftplay-event 0.0.1 → 0.0.2

package/event/exchange_ticket_result.tsx

@@ -1,6 +1,7 @@
 // withHooks
 import { EventExchange_ticketProperty } from 'esoftplay/cache/event/exchange_ticket/import';
 import { EventHeader } from 'esoftplay/cache/event/header/import';
+import { EventOrder_itemProperty } from 'esoftplay/cache/event/order_item/import';
 import { LibCurl } from 'esoftplay/cache/lib/curl/import';
 import { LibDialog } from 'esoftplay/cache/lib/dialog/import';
 import { LibLoading } from 'esoftplay/cache/lib/loading/import';
@@ -9,7 +10,6 @@ import { LibObject } from 'esoftplay/cache/lib/object/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibToastProperty } from 'esoftplay/cache/lib/toast/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
-import { EventOrder_itemProperty } from 'esoftplay/cache/event/order_item/import';
 import esp from 'esoftplay/esp';
 import useGlobalState, { useGlobalReturn } from 'esoftplay/global';
 import useSafeState from 'esoftplay/state';

package/event/firebase_socket.ts

@@ -26,6 +26,10 @@ const state = useGlobalState(0)
 export const lastKeyInPages = useGlobalState<string[]>([])
 export const userIdKeyReplacer = useGlobalState<any>({})
 
+function isValidEventId(event_id: string): boolean {
+  return !!event_id && event_id !== "undefined"
+}
+
 export default function useFirebaseSocket() {
   const [status] = state.useState()
   const isDirect = EventTms_homeProperty.state()
@@ -109,6 +113,10 @@ export default function useFirebaseSocket() {
     const instance: any = esp.mod("firestore/index")().instance()
     const db = getFirestore(instance)
 
+    if (!isValidEventId(event_id)) {
+      return
+    }
+
     if (userIdKeyReplacer.get()?.priority == 1) {
       const coll = collection(db, [getEventPath(), path, event_id].join('/'));
       const q = query(coll, orderBy('t', 'asc'), where("t", "==", userIdKeyReplacer.get().t));

package/event/loading_page.tsx

@@ -100,7 +100,8 @@ export default function m(props: EventLoading_pageProps): any {
         loadingState.set(LibObject.unset(loadingState.get(), post.trx_id)())
         const ticketNotAvailableCodes = ['EV034', 'EV036', 'EV038', 'EV039', 'EV040']
         if (ticketNotAvailableCodes.includes(error.status_code)) {
-          LibNavigation.navigate(post?.is_multi == 1 ? 'event/ticket_list2' : 'event/ticket_list')
+          LibNavigation.back()
+          // LibNavigation.navigate(post?.is_multi == 1 ? 'event/ticket_list2' : 'event/ticket_list')
         }
         if (error.status_code == 'EV033') {
           LibDialog.custom(
@@ -153,7 +154,8 @@ export default function m(props: EventLoading_pageProps): any {
         loadingState.set(LibObject.unset(loadingState.get(), post.trx_id)())
         const ticketNotAvailableCodes = ['EV034', 'EV036', 'EV038', 'EV039', 'EV040']
         if (ticketNotAvailableCodes.includes(error.status_code)) {
-          LibNavigation.navigate(post?.is_multi == 1 ? 'event/ticket_list2' : 'event/ticket_list')
+          LibNavigation.back()
+          // LibNavigation.navigate(post?.is_multi == 1 ? 'event/ticket_list2' : 'event/ticket_list')
         }
         if (error.status_code == 'EV033') {
           LibDialog.custom(

package/event/order.tsx

@@ -128,7 +128,8 @@ export default function m(props: EventOrderProps): any {
   function renderItem(item: any) {
     return (
       <EventOrder_item item={item} onPress={() => {
-        LibNavigation.navigate('event/order_detail', { url: item.url })
+        // 7 pembayaran kadaluarsa
+        LibNavigation.navigate(status == "7" ? 'event/order_detail_waiting' : 'event/order_detail', { url: item.url })
       }} />
     )
   }
@@ -156,41 +157,27 @@ export default function m(props: EventOrderProps): any {
   return (
     <View style={{ backgroundColor: LibStyle.colorBgGrey, flex: 1 }}>
       <EventHeader title={esp.lang("event/order", "my_order")} />
-      {
-        esp.isDebug('filter_order_status') ?
-          <View style={{ minHeight: 50 }} >
-            <LibScroll
-              initialNumToRender={20}
-              horizontal
-            >
-              <View style={{ width: 10 }} />
-              <Pressable
-                onPress={() => { statusRef.current?.show() }}
-                style={applyStyle({ height: 30, marginVertical: 10, marginRight: 10, borderRadius: 12, backgroundColor: 'white', borderColor: '#ccc', borderWidth: 1, paddingHorizontal: 10, justifyContent: 'center', flexDirection: 'row', alignItems: 'center' })} >
-                <LibTextstyle textStyle='footnote' text={allStatus[allStatus.findIndex((x) => String(x.code) == status)]?.text || esp.lang("event/order", "all_statis")} style={applyStyle({ fontSize: 11, color: "#4E4E4E", marginRight: 5 })} />
-                <LibIcon name='chevron-down' style={applyStyle({ color: "#4E4E4E" })} />
-              </Pressable>
-              <Pressable
-                onPress={() => { dialogFilterDate?.current?.show() }}
-                style={applyStyle({ height: 30, marginVertical: 10, marginRight: 10, borderRadius: 12, backgroundColor: 'white', borderColor: '#ccc', borderWidth: 1, paddingHorizontal: 10, justifyContent: 'center', flexDirection: 'row', alignItems: 'center' })} >
-                <LibTextstyle textStyle='footnote' text={selectedDate.id == 4 ? LibUtils.getDateRange(selectedDate?.date_start, selectedDate?.date_end) : selectedDate?.title} style={applyStyle({ fontSize: 11, color: "#4E4E4E", marginRight: 5 })} />
-                <LibIcon name='calendar' size={14} style={applyStyle({ color: "#4E4E4E" })} />
-              </Pressable>
-            </LibScroll>
-            <EventSection_menu size='line' />
-          </View>
-          :
-          <View style={{ margin: 15, marginBottom: 0, flexDirection: 'row', justifyContent: 'space-between' }}>
-            <View style={{ flex: 10 }}>
-              <Status status={status} onChangeStatus={setStatus} />
-            </View>
-            <TouchableOpacity onPress={() => {
-              dialogFilterDate.current!.show()
-            }} style={{ flex: 1, marginLeft: 15 }}>
-              <LibIcon name="calendar" />
-            </TouchableOpacity>
-          </View>
-      }
+      <View style={{ minHeight: 50 }} >
+        <LibScroll
+          initialNumToRender={20}
+          horizontal
+        >
+          <View style={{ width: 10 }} />
+          <Pressable
+            onPress={() => { statusRef.current?.show() }}
+            style={applyStyle({ height: 30, marginVertical: 10, marginRight: 10, borderRadius: 12, backgroundColor: 'white', borderColor: '#ccc', borderWidth: 1, paddingHorizontal: 10, justifyContent: 'center', flexDirection: 'row', alignItems: 'center' })} >
+            <LibTextstyle textStyle='footnote' text={allStatus[allStatus.findIndex((x) => String(x.code) == status)]?.text || esp.lang("event/order", "all_statis")} style={applyStyle({ fontSize: 11, color: "#4E4E4E", marginRight: 5 })} />
+            <LibIcon name='chevron-down' style={applyStyle({ color: "#4E4E4E" })} />
+          </Pressable>
+          <Pressable
+            onPress={() => { dialogFilterDate?.current?.show() }}
+            style={applyStyle({ height: 30, marginVertical: 10, marginRight: 10, borderRadius: 12, backgroundColor: 'white', borderColor: '#ccc', borderWidth: 1, paddingHorizontal: 10, justifyContent: 'center', flexDirection: 'row', alignItems: 'center' })} >
+            <LibTextstyle textStyle='footnote' text={selectedDate.id == 4 ? LibUtils.getDateRange(selectedDate?.date_start, selectedDate?.date_end) : selectedDate?.title} style={applyStyle({ fontSize: 11, color: "#4E4E4E", marginRight: 5 })} />
+            <LibIcon name='calendar' size={14} style={applyStyle({ color: "#4E4E4E" })} />
+          </Pressable>
+        </LibScroll>
+        <EventSection_menu size='line' />
+      </View>
 
       <LibInfinite
         url={buildUrl(url) + "&t=" + new Date().getTime()}

package/event/order_detail.tsx

@@ -20,9 +20,10 @@ import { UserClass } from 'esoftplay/cache/user/class/import';
 
 import { applyStyle } from 'esoftplay';
 import { EventAlert } from 'esoftplay/cache/event/alert/import';
+import { EventButton_order_detail } from 'esoftplay/cache/event/button_order_detail/import';
+import { EventConfigProperty } from 'esoftplay/cache/event/config/import';
 import { EventHtmltext } from 'esoftplay/cache/event/htmltext/import';
 import { EventIndexProperty } from 'esoftplay/cache/event/index/import';
-import { EventOrder_detail_upgrade_button } from 'esoftplay/cache/event/order_detail_upgrade_button/import';
 import { EventPopup } from 'esoftplay/cache/event/popup/import';
 import { EventQr_bg } from 'esoftplay/cache/event/qr_bg/import';
 import { EventRating } from 'esoftplay/cache/event/rating/import';
@@ -133,8 +134,6 @@ export default function m(props: EventOrder_detailProps): any {
   function loadData(): void {
     new LibCurl(url + ((url.includes("?") ? "&" : "?") + 't=' + new Date().getTime()), null, (res: any) => {
       setResult(res)
-      // esp.log(res);
-
       new LibCurl(res?.url_coupon, null, (ress: any) => {
         setCoupons(ress)
       }, (error: any) => {
@@ -176,6 +175,7 @@ export default function m(props: EventOrder_detailProps): any {
   }
 
   useEffect(() => {
+    EventConfigProperty.curlConfig('v2/config_order_type')
     loadData()
   }, [])
 
@@ -204,21 +204,6 @@ export default function m(props: EventOrder_detailProps): any {
     setDataReview(subs.getValue())
   })
 
-  function doCancel(url: string): void {
-    LibDialog.warningConfirm(esp.lang("event/order_detail", "confirm"), esp.lang("event/order_detail", "cancel_this_order"), esp.lang("event/order_detail", "btn_yes"), () => {
-      LibProgress.show(esp.lang("event/order_detail", "please_wait"))
-      new LibCurl(url, null, (result: any, msg: any) => {
-        LibProgress.hide()
-        LibNavigation.back()
-      }, (error: any) => {
-        LibDialog.warning(esp.lang("event/order_detail", "cancel_err"), error?.message);
-        LibProgress.hide()
-      }, 1)
-    }, esp.lang("event/order_detail", "btn_cancel"), () => {
-
-    })
-  }
-
   function addReturn(): void {
     if (qty < Number(result.qty_returnable)) {
       setQty(qty + 1)
@@ -229,10 +214,13 @@ export default function m(props: EventOrder_detailProps): any {
     setQty(qty == 1 ? 1 : qty - 1)
   }
 
-  function sendBack() {
+  function sendBack(p: any) {
     LibDialog.confirm(esp.lang("event/order_detail", "warning"), esp.lang("event/order_detail", "return_this_ticket"), esp.lang("event/order_detail", "btn_yes"), () => {
       LibProgress.show(esp.lang("event/order_detail", "please_wait"))
-      new LibCurl('event_booking_shared_return?booking_id=' + result?.id + '&qty_shared=' + qty, null, (res: any, msg: any) => {
+      let post = {
+        pin: p
+      }
+      new LibCurl('event_booking_shared_return?booking_id=' + result?.id + '&qty_shared=' + qty, post, (res: any, msg: any) => {
         // LibNotify(res)
         LibProgress.hide()
         LibDialog.info(esp.lang("event/order_detail", "information"), msg)
@@ -245,6 +233,55 @@ export default function m(props: EventOrder_detailProps): any {
     }, esp.lang("event/order_detail", "btn_cancel"), () => { })
   }
 
+  function loadDataAddons(id: any, url: string) {
+    LibProgress.show(esp.lang("event/order_detail", "wait"))
+    new LibCurl(url, null, (res: any, msg: any) => {
+      esp.log({ res });
+      LibProgress.hide()
+      let dataBookingEvent = {
+        event_id: res?.event_id,
+        event_title: res?.event_name,
+        selected_ticket: {
+          price_id: res?.price_id,
+          currency: res?.currency,
+          tax: res?.tax,
+          fee: res?.fee,
+          fee_percent: res?.fee_percent,
+          term: res?.term,
+          has_addition: res?.has_addition,
+          list: {
+            ondate: res?.ondate,
+            price: res?.price,
+            price_id: res?.price_id,
+            currency: res?.currency,
+          }
+        },
+        qty: result?.qty
+      }
+      let fee_platform = {
+        fee_platform_amount: res?.fee_platform?.fee_platform_amount,
+        fee_platform_type: res?.fee_platform?.fee_platform_type
+      }
+      let show_fee_percentage = res?.show_fee_percentage
+      let tax = res?.tax
+      let order_type = EventConfigProperty.state().get()?.order_type?.ticket
+      let addons_id = id
+      let booking_id_ref = result?.id
+      LibNavigation.navigate('payment/ticket', {
+        order_type: order_type,
+        tax: tax,
+        fee_platform: fee_platform,
+        dataBookingEvent: dataBookingEvent,
+        show_fee_percentage,
+        addons_id,
+        booking_id_ref
+      })
+    }, (err: any) => {
+      LibProgress.hide()
+      esp.log({ err });
+    }, 1)
+  }
+
   if (result == undefined && !coupons) {
     return (
       <View style={{ flex: 1, backgroundColor: '#f6f6f6' }}>
@@ -365,6 +402,11 @@ export default function m(props: EventOrder_detailProps): any {
             <View testID='price_name' style={{ marginTop: 10, borderWidth: 5, padding: 3, borderColor: result?.color, backgroundColor: EventOrder_itemProperty.textColor(result?.color) }}>
               <View style={{ padding: 10, backgroundColor: result?.color, justifyContent: 'center', alignContent: 'center', alignItems: 'center' }}>
                 <EventHtmltext allowFontScaling={false} numberOfLines={3} ellipsizeMode="tail" style={{ color: EventOrder_itemProperty.textColor(result?.color), alignSelf: 'center', textAlign: 'center', fontSize: 20, fontWeight: 'bold' }}> {result?.price_name}</EventHtmltext>
+                {
+                  result?.ondate != "0000-00-00" &&
+                  <Text allowFontScaling={false} style={{ flex: 1, marginRight: 10, marginLeft: 6, fontFamily: "Arial", fontSize: 14, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: EventOrder_itemProperty.textColor(result?.color) }}>{moment(result?.ondate).localeFormat("DD MMMM YYYY")}</Text>
+                }
+
               </View>
             </View>
 
@@ -402,10 +444,13 @@ export default function m(props: EventOrder_detailProps): any {
                   </View>
                 }
 
-                <View style={{ flexDirection: 'row', alignContent: 'center', alignItems: 'center' }}>
-                  <LibIcon name="calendar-blank-outline" size={20} />
-                  <Text allowFontScaling={false} style={{ flex: 1, marginRight: 10, marginLeft: 6, fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{result?.ondate != "0000-00-00" ? moment(result?.ondate).localeFormat("DD MMMM YYYY") : ((isInvitationDate || isOnlineWithoutDate) ? esp.lang("event/order_item", "used_once") : dateRange)}</Text>
-                </View>
+                {
+                  result?.ondate == "0000-00-00" &&
+                  <View style={{ flexDirection: 'row', alignContent: 'center', alignItems: 'center' }}>
+                    <LibIcon name="calendar-blank-outline" size={20} />
+                    <Text allowFontScaling={false} style={{ flex: 1, marginRight: 10, marginLeft: 6, fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{((isInvitationDate || isOnlineWithoutDate) ? esp.lang("event/order_item", "used_once") : dateRange)}</Text>
+                  </View>
+                }
                 {
                   result?.use_seat == 1 &&
                   <View style={{ marginTop: 15, marginRight: 10 }}>
@@ -470,19 +515,23 @@ export default function m(props: EventOrder_detailProps): any {
 
         <EventAlert
           color="#FFC523"
-          msg={esp.lang("event/order_detail", "not_allowed_ss")}
+          msg={esp.lang("event/order_detail", "not_allowed_ss", esp.appjson().expo.name)}
           useIcon
           style={{ marginBottom: 0, margin: 15 }}
         />
 
         <UseCondition if={result?.is_luckydraw && result?.is_luckydraw == 1}>
-          <TouchableOpacity onPress={() => {
-            LibNavigation.navigateForResult('event/order_lottery', { id: result?.id }).then(() => {
-              loadData()
-            })
-          }} style={{ margin: 15, padding: 10, marginBottom: 0, justifyContent: 'center', alignContent: 'center', alignItems: 'center', borderRadius: 7, backgroundColor: LibStyle.colorGreen, paddingBottom: 10 }}>
-            <LibTextstyle textStyle='headline' text={esp.lang("event/order_detail", "join_lucky_draw")} style={{ color: '#fff', fontWeight: 'bold' }} />
-          </TouchableOpacity>
+          <EventButton_order_detail
+            color={"#FF6F61"}
+            onPress={() => {
+              LibNavigation.navigateForResult('event/order_lottery', { id: result?.id }).then(() => {
+                loadData()
+              })
+            }}
+            icon={'dice-multiple'}
+            title={result?.config_luckydraw != null ? result?.config_luckydraw?.title : esp.lang("event/order_detail", "join_lucky_draw")}
+            info={result?.config_luckydraw != null ? result?.config_luckydraw?.subtitle : esp.lang("event/order_detail", "subtitle_lucky_draw")}
+          />
         </UseCondition>
 
         <UseCondition if={result?.is_luckydraw && result?.is_luckydraw == 2}>
@@ -492,14 +541,39 @@ export default function m(props: EventOrder_detailProps): any {
         </UseCondition>
 
         <UseCondition if={result?.is_upgradable == 1} >
-          <EventOrder_detail_upgrade_button onPress={() => {
-            LibNavigation.navigate('event/order_detail_upgrade', {
-              url: result?.url_upgrade,
-              dataTicket: result,
-            })
-          }} />
+          <EventButton_order_detail
+            color={LibStyle.colorPrimary}
+            onPress={() => {
+              LibNavigation.navigate('event/order_detail_upgrade', {
+                url: result?.url_upgrade,
+                dataTicket: result,
+              })
+            }}
+            icon={'chevron-up-circle'}
+            title={esp.lang("event/order_detail_upgrade_button", "upgrade")}
+            info={esp.lang("event/order_detail_upgrade_button", "eays")}
+          />
         </UseCondition>
 
+
+
+        {/* tombol add on */}
+        {
+          result?.addons?.length > 0 && result?.addons?.map((item: any, i: number) => {
+            return (
+              <EventButton_order_detail
+                color={result?.color}
+                onPress={() => {
+                  loadDataAddons(item?.addons_id, item?.url)
+                }}
+                icon={'plus-circle'}
+                title={item.title}
+                info={item.info}
+              />
+            )
+          })
+        }
+
         {
           // jika mau edit view dibawah ini, tekan ctrl + f terus paste prefik dibawah ini
           // view_reviewed
@@ -588,7 +662,7 @@ export default function m(props: EventOrder_detailProps): any {
           result?.status != "2" && coupons &&
           <View style={{ margin: 15, marginBottom: 0, borderRadius: 7, backgroundColor: '#fff', paddingBottom: 10, paddingTop: 10 }}>
             <View style={{ marginHorizontal: 20 }}>
-              <Text style={{ fontWeight: 'bold', fontSize: 14, color: LibStyle.colorPrimary }}>{coupons.title || ''}</Text>
+              <Text style={{ fontWeight: 'bold', fontSize: 14, color: "#495057" }}>{coupons.title || ''}</Text>
             </View>
 
             {
@@ -725,7 +799,7 @@ export default function m(props: EventOrder_detailProps): any {
         <View style={{ padding: 5, }}>
           <EventButton label={Number(result.is_shareable) ? /*share_ticket*/esp.lang("event/order_detail", "share_ticket") : esp.lang("event/order_detail", "shared")} onPress={() => {
             if (Number(result.is_shareable)) {
-              LibDialog.confirm(esp.lang("event/order_detail", "share_title"), esp.lang("event/order_detail", "share_msg"), esp.lang("event/order_detail", "share_ok"), () => {
+              LibDialog.confirm(esp.lang("event/order_detail", "share_title"), esp.lang("event/order_detail", "share_msg", esp.appjson().expo.name), esp.lang("event/order_detail", "share_ok"), () => {
                 LibNavigation.navigate('event/order_share_to', { url: url })
               }, esp.lang("event/order_detail", "share_no"), () => {
 
@@ -772,7 +846,11 @@ export default function m(props: EventOrder_detailProps): any {
                 returnTicket: true,
               })
             } else {
-              sendBack()
+              LibNavigation.navigateForResult("bigbang/payment_pin", undefined, 1132).then((p) => {
+                if (p) {
+                  sendBack(p)
+                }
+              })
             }
             dialogSendBack.current!.hide()
           }} cancel={() => {

package/event/order_detail_upgrade.tsx

@@ -120,7 +120,10 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
                 } else {
                   LibDialog.warning(esp.lang("event/order_detail_upgrade", "oops"), item.message_error)
                 }
-              }} key={i} style={{ ...LibStyle.elevation(2), marginHorizontal: 15, marginTop: 2.5, marginBottom: 10, borderRadius: 10, backgroundColor: item.status == 0 ? LibStyle.colorBgGrey : selectedTicket?.selected_ticket?.id == item.id ? LibStyle.colorGreen : "#fff", padding: 10, alignContent: 'center', alignItems: 'center', justifyContent: 'center' }}>
+              }} key={i} style={{
+                ...LibStyle.elevation(2), marginHorizontal: 15, marginTop: 2.5, marginBottom: 10, borderRadius: 10,
+                backgroundColor: item.status == 0 ? LibStyle.colorBgGrey : selectedTicket?.selected_ticket?.id == item.id ? LibStyle.colorGreen : "#fff", padding: 10, alignContent: 'center', alignItems: 'center', justifyContent: 'center'
+              }}>
                 <EventHtmltext allowFontScaling={false} style={{ marginHorizontal: 5, fontSize: 16, color: item.status == 0 ? "#c9c9c9" : selectedTicket?.selected_ticket?.id == item.id ? "#fff" : "#000", textAlign: 'center', fontWeight: 'bold' }} numberOfLines={2} ellipsizeMode={'tail'}>{item?.price_name_to}</EventHtmltext>
                 <Text allowFontScaling={false} style={{ fontSize: 14, fontWeight: 'bold', marginTop: 5, color: item.status == 0 ? "#c9c9c9" : selectedTicket?.selected_ticket?.id == item.id ? "#fff" : "#000" }}>{"+ " + LibUtils.money(Number(dataTicket?.qty_upgrade) * Number(item?.amount), item?.currency)}</Text>
 
@@ -139,10 +142,12 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
         <EventButton label={esp.lang("event/order_detail_upgrade", "btn_next")} onPress={() => {
           if (selectedTicket) {
             if (selectedTicket?.selected_ticket?.use_seat == 1 && selectedTicket?.selected_ticket?.seat_autopick == 0) {
-              LibNavigation.navigateForResult('event/seat_map', {
+              LibNavigation.navigateForResult('event/seat_map_new', {
                 url: 'event_seat',
                 dataTicket: selectedTicket
               }).then((value) => {
+                let seatData: any = {}
+                seatData.seat_label = value?.seat_label
                 LibNavigation.navigate('event/order_detail_upgrade_payment', {
                   dataTicket: {
                     url_payment: result?.url_payment,
@@ -157,9 +162,7 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
                   },
                   selectedTicket: {
                     ...selectedTicket,
-                    row_id: value?.row_id,
-                    column_id: value?.column_id,
-                    seat_name: value?.seat_name,
+                    ...seatData
                   },
                   fee_platform: {
                     fee_platform_amount: selectedTicket?.selected_ticket?.fee_platform_amount,

package/event/order_detail_upgrade_payment.tsx

@@ -15,7 +15,7 @@ import { LibStyle } from "esoftplay/cache/lib/style/import";
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle/import';
 import esp from "esoftplay/esp";
 import useSafeState from "esoftplay/state";
-import { ScrollView, Text, View } from "react-native";
+import { Linking, ScrollView, Text, View } from "react-native";
 
 
 
@@ -37,6 +37,8 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
   const scrollYRef = useRef(0)
   const dialogSeat = useRef<LibSlidingup>(null)
 
+  esp.log({ dataTicket, selectedTicket });
+
   function doUpgrade(pin?: any) {
     const LibToastProperty = esp.modProp("lib/toast")
     if (!selectedPayment) {
@@ -54,9 +56,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
       }
 
       if (selectedTicket?.selected_ticket?.use_seat == 1) {
-        post.row_id = selectedTicket?.row_id
-        post.column_id = selectedTicket?.column_id
-        post.seat_name = selectedTicket?.seat_name
+        post.seat_label = selectedTicket?.seat_label.join('|')
       }
 
       if (selectedTicket?.selected_ticket?.seat_autopick == 1) {
@@ -68,17 +68,17 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
       }
       LibProgress.show(esp.lang("event/order_detail_upgrade_payment", "confirm_wait"))
       new LibCurl('event_order_detail_upgrade_checkout', post, (res, msg) => {
-        esp.log({ post });
         LibProgress.hide()
         LibNavigation.reset()
-        if (selectedPayment?.payment_id == 2) /* bbo pay */ {
-          LibToastProperty.show(msg)
-          LibNavigation.navigate('event/order_detail', { url: res?.url })
-        } else if (selectedPayment?.payment_id == 3)/* cc */ {
+        if (res?.hasOwnProperty('url_mobile') && res?.url_mobile != null) {
+          Linking.openURL(res?.url_mobile)
+          LibNavigation.push('event/order_detail_waiting', { url: res?.url })
+        } else if (res?.hasOwnProperty('url_web') && res?.url_web != null) {
           LibNavigation.navigateForResult('payment/cc_web', {
             ...res,
             statusSuccess: [1]
           }).then((res) => {
+            LibNavigation.backToRoot()
             LibNavigation.push('user/profile')
             if (res?.hasOwnProperty('params_error') || res?.hasOwnProperty('failed')) {
               LibNavigation.push('event/order_waiting')
@@ -88,8 +88,14 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
             }
           })
         } else {
-          LibNavigation.navigate('event/order_detail_waiting', { url: res?.url })
+          if (res?.url?.includes("waiting")) {
+            LibNavigation.push('event/order_waiting')
+          }
+          LibNavigation.push(res?.url?.includes("waiting") ? 'event/order_detail_waiting' : 'event/order_detail', {
+            url: res.url,
+          })
         }
+
       }, (err) => {
         LibProgress.hide()
         LibDialog.warning(esp.lang("event/order_detail_upgrade_payment", "oops"), err?.message)
@@ -142,8 +148,8 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
           }
         }
       }}>
-        {/* detail */}
 
+        {/* detail */}
         <View style={{ backgroundColor: 'white' }}>
           <BigbangPayment_detail
             ondate={dataTicket?.ondate}

package/event/order_detail_visitor.tsx

@@ -32,8 +32,8 @@ export default function m(props: EventOrder_detail_visitorProps): any {
 
   function loadData() {
     new LibCurl(url, null, (res, msg) => {
-      esp.log({ res });
       setResult(res)
+      esp.log(res);
     }, (err) => {
       setError(err)
     })
@@ -106,11 +106,6 @@ export default function m(props: EventOrder_detail_visitorProps): any {
     return finalResult
   }
 
-  let filterBuyerVisitor = result?.tickets?.reduce((r: any, a: any) => {
-    r[a.email] = [...r[a.email] || [], a];
-    return r;
-  }, {});
-
   return (
     <View style={{ flex: 1, backgroundColor: LibStyle.colorBgGrey }}>
       <EventHeader title={esp.lang("event/order_detail_visitor", "header")} />
@@ -123,44 +118,49 @@ export default function m(props: EventOrder_detail_visitorProps): any {
             <ScrollView>
               <View style={{ margin: 15, borderRadius: 10, backgroundColor: '#fff', padding: 10 }}>
                 {
-                  Object.values(filterBuyerVisitor)?.map((item: any, i: number) => {
+                  result?.tickets?.map((item: any, i: number) => {
                     return (
                       <View key={i} style={{ marginLeft: 14, marginBottom: 15, flexDirection: 'row', alignContent: 'center', alignItems: 'center', justifyContent: 'space-between' }}>
                         <View style={{ flex: 1, flexDirection: 'row', alignContent: 'center', alignItems: 'center' }}>
                           <Text allowFontScaling={false} style={{ marginRight: 6, fontFamily: "Arial", fontSize: 30, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{i + 1}.</Text>
-                          <View style={{ flex: 1 }} >
-                            <Text allowFontScaling={false} style={{ fontFamily: "Arial", marginTop: 10, fontSize: 10, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#c3c3c3" }}>{esp.lang("event/order_detail", "buyer_name")}</Text>
-                            <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a", marginTop: 4 }} ellipsizeMode='tail'>{item[0].name}</Text>
-                            <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 10, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#c3c3c3", marginTop: 10 }}>{esp.lang("event/order_detail", "phone_number")}</Text>
-                            <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a", marginTop: 4 }}>{item[0].phone.trim()}</Text>
+                          <View >
+                            <View style={{ flex: 1 }}>
+                              <Text allowFontScaling={false} style={{ fontFamily: "Arial", marginTop: 10, fontSize: 10, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#c3c3c3" }}>{esp.lang("event/order_detail", "buyer_name")}</Text>
+                              <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a", marginTop: 4 }} ellipsizeMode='tail'>{item?.name}</Text>
+                              <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 10, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#c3c3c3", marginTop: 10 }}>{esp.lang("event/order_detail", "phone_number")}</Text>
+                              <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a", marginTop: 4 }}>{item?.phone == "" ? "-" : item?.phone.trim()}</Text>
+                            </View>
+                            {
+                              item?.redemption?.length > 0 &&
+                              <View style={{ marginTop: 3 }}>
+                                <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 10, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#c3c3c3", marginTop: 7 }}>{"Item Redemption"}</Text>
+                                <View style={{ flexDirection: 'row', flex: 1, flexWrap: 'wrap', justifyContent: 'space-around' }}>
+                                  {
+                                    item?.redemption?.map((x: any, ii: number) => {
+                                      return (
+                                        <View key={ii} style={{ borderRadius: 3, marginRight: 6, backgroundColor: LibStyle.colorPrimary, padding: 5 }}>
+                                          <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#fff" }}>{x}</Text>
+                                        </View>
+                                      )
+                                    })
+                                  }
+                                </View>
+                              </View>
+                            }
                           </View>
                         </View>
-                        <View style={{ flexDirection: 'row', alignContent: 'center', alignItems: 'center' }}>
-                          <Text allowFontScaling={false} style={{ marginLeft: 6, fontFamily: "Arial", fontSize: 20, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{item.length}</Text>
-                          <Text allowFontScaling={false} style={{ marginLeft: 4, fontFamily: "Arial", fontSize: 16, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{esp.lang("event/order_detail", "ticket")}</Text>
+                        <View style={{ alignContent: 'center', alignItems: 'center' }}>
+                          {
+                            item.hasOwnProperty('seat_name') && item?.seat_name != "" &&
+                            <View style={{ paddingVertical: 5, paddingHorizontal: 7, borderWidth: 1, borderColor: '#000', backgroundColor: '#fff', borderRadius: 5, marginRight: 7 }}>
+                              <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 20, color: '#000' }}>{item.seat_name}</Text>
+                            </View>
+                          }
                         </View>
                       </View>
                     )
                   })
                 }
-
-                {
-                  result?.flag?.use_seat == 1 &&
-                  <>
-                    <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a" }}>{esp.lang("event/order_detail", "seat_number")}</Text>
-                    <View style={{ flexDirection: 'row', flexWrap: 'wrap', marginLeft: -10, padding: 10 }}>
-                      {
-                        result?.tickets?.map((item: any, i: number) => {
-                          return (
-                            <View key={i} style={{ paddingVertical: 5, paddingHorizontal: 7, borderWidth: 1, borderColor: '#000', backgroundColor: '#fff', borderRadius: 5, marginRight: 7 }}>
-                              <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 20, color: '#000' }}>{item.seat_name}</Text>
-                            </View>
-                          )
-                        })
-                      }
-                    </View>
-                  </>
-                }
               </View>
 
               {