esoftplay-event 0.0.0-e → 0.0.0-f

package/config.json

@@ -1,9 +1,9 @@
 {
   "fonts": {
-    "mono": "mono.ttf",
     "Arial": "Arial.ttf",
     "ArialBold": "ArialBold.ttf",
     "SFProText": "SFProText.ttf",
+    "mono": "mono.ttf",
     "MonoSpace": "MonoSpace.ttf",
     "DecoNumbers": "DecoNumbers.ttf",
     "digital": "digital.ttf"

package/event/entrance_idcard.tsx

@@ -12,7 +12,6 @@ import { LibObject } from 'esoftplay/cache/lib/object/import';
 import { LibPicture } from 'esoftplay/cache/lib/picture/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 { UserClass } from 'esoftplay/cache/user/class/import';
 import esp from 'esoftplay/esp';
 import useSafeState from 'esoftplay/state';
@@ -75,10 +74,7 @@ export default function m(props: EventTms_idcardProps): any {
   }, [])
 
   function entrance() {
-    let url = url_ticket_update + LibUtils.objectToUrlParam({
-      is_turnstile: 0,
-    })
-
+    let url = url_ticket_update
     let post = {
       "target-url": `https://api.${esp.config().domain}/gate_checkin`,
       price_id: 0,

package/event/entrance_success.tsx

@@ -93,9 +93,7 @@ export default function m(props: EventTms_in_successProps): any {
   }
 
   function useTicket() {
-    let url = url_ticket_update + LibUtils.objectToUrlParam({
-      is_turnstile: 0,
-    })
+    let url = url_ticket_update
 
     let post = {
       "target-url": `https://api.${esp.config().domain}/gate_checkin`,

package/event/firebase_socket.ts

@@ -234,7 +234,7 @@ export default function useFirebaseSocket() {
     return ori
   }
 
-  // get weather function 
+  // get weather function
 
   function getQueue(path: string, event_id: string, _limit: number, cb: (idx: number, key: string) => void) {
     const instance = initAppCustom()
@@ -301,9 +301,7 @@ export default function useFirebaseSocket() {
 
   function useQueueConfigListener() {
     function action() {
-      fetch(esp.isDebug("") ?
-        "https://storage.googleapis.com/bbo-images/images/modules/api/event_queue.json" + "?t=" + new Date().getTime() :
-        "https://storage.googleapis.com/bbo-images/bbo.co.id/images/modules/api/event_queue.json" + "?t=" + new Date().getTime(), { "method": "GET" })
+      fetch(esp.config("events", "queue") + "?t=" + new Date().getTime(), { "method": "GET" })
         .then(res => res.json())
         .then((re) => {
           eventQueueConfig.set(re)

package/event/hall_in_failed.tsx

@@ -83,7 +83,7 @@ export default function m(props: EventTms_in_hall_failedProps): any {
         tms_id: UserClass.state().get()?.id,
         scanned: LibUtils.moment().format('YYYY-MM-DD HH:mm:ss'),
       }
-      new LibCurl(url_ticket_update + "?is_turnstile=0", post,
+      new LibCurl(url_ticket_update, post,
         (res) => {
           doneEntrance += 1
           if (mustBeEntrance <= doneEntrance) {

package/event/index.tsx

@@ -96,7 +96,7 @@ export default function m(props: EventIndexProps): any {
   }, [isFocus])
 
   function loadData() {
-    new LibCurl(esp.isDebug("") ? "https://storage.googleapis.com/bbo-images/images/modules/api/home_event.json" : "https://storage.googleapis.com/bbo-images/bbo.co.id/images/modules/api/home_event.json", null, (res) => {
+    new LibCurl(esp.config("events", "home"), null, (res) => {
       setData(res)
     }, msg => setError(msg))
   }

package/event/order_detail.tsx

@@ -364,7 +364,7 @@ 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={1} ellipsizeMode="tail" style={{ color: EventOrder_itemProperty.textColor(result?.color), alignSelf: 'center', textAlign: 'center', fontSize: 20, fontWeight: 'bold' }}> {result?.price_name}</EventHtmltext>
+                <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>
               </View>
             </View>
 

package/event/order_detail_upgrade.tsx

@@ -6,6 +6,7 @@ import { useEffect } from 'react';
 
 import { applyStyle } from 'esoftplay';
 import { EventButton } from 'esoftplay/cache/event/button/import';
+import { EventHtmltext } from 'esoftplay/cache/event/htmltext/import';
 import { EventMessage } from 'esoftplay/cache/event/message/import';
 import { LibCurl } from 'esoftplay/cache/lib/curl/import';
 import { LibDialog } from 'esoftplay/cache/lib/dialog/import';
@@ -30,20 +31,29 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
   const [selectedTicket, setSelectedTicket] = useSafeState()
   const [result, setResult] = useSafeState()
   const [error, setError] = useSafeState()
+  // const [resultEvent, setResultEvent] = useSafeState()
 
   function loadDataUpgradeTicket() {
     new LibCurl(url, null, (res: any, msg: string) => {
       // setAvailableUpgrade(res?.list)
-      // esp.log(res);
       setResult(res)
     }, (err: any) => {
       setError(err)
     })
   }
 
+  // function loadDataEvent() {
+  //   new LibCurl("event_detail/" + dataTicket?.event_id, null, (res: any, msg: string) => {
+  //     setResultEvent(res)
+  //   }, (err: any) => {
+
+  //   })
+  // }
+
 
   useEffect(() => {
     loadDataUpgradeTicket()
+    // loadDataEvent()
   }, [])
 
   if (!result && !error) {
@@ -75,8 +85,8 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
         <LibTextstyle textStyle='m_overline' text={esp.lang("event/order_detail_upgrade", "current_ticket")} style={{ fontSize: 12, margin: 15, marginBottom: 0 }} />
 
         <View style={{ ...LibStyle.elevation(2), margin: 15, width: LibStyle.width - 30, borderRadius: 10, backgroundColor: LibStyle.colorBgGrey, padding: 10, height: 100, alignContent: 'center', alignItems: 'center', justifyContent: 'center' }}>
-          <LibTextstyle style={{ marginHorizontal: 5, fontSize: 20, color: "#000", textAlign: 'center', fontWeight: 'bold' }} numberOfLines={2} ellipsizeMode={'tail'} textStyle='m_button' text={dataTicket?.price_name} />
-          <Text allowFontScaling={false} style={{ color: "#000" }}>{LibUtils.money(dataTicket.total)}</Text>
+          <EventHtmltext allowFontScaling={false} style={{ marginHorizontal: 5, fontSize: 20, color: "#000", textAlign: 'center', fontWeight: 'bold' }} numberOfLines={2} ellipsizeMode={'tail'}>{dataTicket?.price_name}</EventHtmltext>
+          <Text allowFontScaling={false} style={{ color: "#000", marginTop: 10 }}>{LibUtils.money(dataTicket.total, dataTicket?.currency)}</Text>
 
           <View style={applyStyle({ flexDirection: 'row', alignItems: 'center', justifyContent: 'center', position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 })}>
             <View style={applyStyle({ width: 25, height: 25, borderRadius: 12.5, backgroundColor: "#fff", marginLeft: -12.5 })} />
@@ -104,15 +114,16 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
                         ondate: item.ondate
                       },
                     },
-                    qty: dataTicket?.qty_upgrade
+                    qty: dataTicket?.qty_upgrade,
+                    tax_event: item.tax
                   }
                   setSelectedTicket(a)
                 } else {
                   LibDialog.warning(esp.lang("event/order_detail_upgrade", "oops"), item.message_error)
                 }
               }} key={i} style={{ ...LibStyle.elevation(2), width: LibStyle.width - 35, marginLeft: 2.5, 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' }}>
-                <LibTextstyle 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'} textStyle='m_button' text={item?.price_name_to} />
-                <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))}</Text>
+                <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>
 
                 {
                   item.info &&
@@ -134,19 +145,47 @@ export default function m(props: EventOrder_detail_upgradeProps): any {
                 dataTicket: selectedTicket
               }).then((value) => {
                 LibNavigation.navigate('event/order_detail_upgrade_payment', {
-                  dataTicket: dataTicket,
+                  dataTicket: {
+                    url_payment: result?.url_payment,
+                    price_name: dataTicket?.price_name,
+                    booking_id: dataTicket?.id,
+                    qty_upgrade: dataTicket?.qty_upgrade,
+                    tax_event: selectedTicket?.tax_event,
+                    ondate: dataTicket?.ondate,
+                    event_title: dataTicket?.event_name,
+                    event_id: dataTicket?.event_id,
+                    // ...dataTicket
+                  },
                   selectedTicket: {
                     ...selectedTicket,
                     row_id: value?.row_id,
                     column_id: value?.column_id,
                     seat_name: value?.seat_name,
+                  },
+                  fee_platform: {
+                    fee_platform_amount: selectedTicket?.selected_ticket?.fee_platform_amount,
+                    fee_platform_type: selectedTicket?.selected_ticket?.fee_platform_type,
                   }
                 })
               })
             } else {
               LibNavigation.navigate('event/order_detail_upgrade_payment', {
-                dataTicket: dataTicket,
-                selectedTicket: selectedTicket
+                dataTicket: {
+                  url_payment: result?.url_payment,
+                  price_name: dataTicket?.price_name,
+                  booking_id: dataTicket?.id,
+                  qty_upgrade: dataTicket?.qty_upgrade,
+                  tax_event: selectedTicket?.tax_event,
+                  ondate: dataTicket?.ondate,
+                  event_title: dataTicket?.event_name,
+                  event_id: dataTicket?.event_id,
+                  // ...dataTicket
+                },
+                selectedTicket: selectedTicket,
+                fee_platform: {
+                  fee_platform_amount: selectedTicket?.selected_ticket?.fee_platform_amount,
+                  fee_platform_type: selectedTicket?.selected_ticket?.fee_platform_type,
+                }
               })
             }
           } else {

package/event/order_detail_upgrade_payment.tsx

@@ -26,9 +26,9 @@ export interface EventOrder_detail_upgrade_paymentProps {
 
 }
 export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
-  const { dataTicket, selectedTicket }: any = LibNavigation.getArgsAll(props)
+  const { dataTicket, selectedTicket, fee_platform }: any = LibNavigation.getArgsAll(props)
   const [selectedPayment, setSelectedPayment] = useSafeState<any>()
-  const [platformFee, setPlatformFee] = useSafeState<any>()
+  const [platformFee, setPlatformFee] = useSafeState<any>(fee_platform)
   const [charge, setCharge] = useSafeState<any>(0)
   const [chargePercent, setChargePercent] = useSafeState<any>()
 
@@ -46,7 +46,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
 
     LibDialog.confirm(esp.lang("event/order_detail_upgrade_payment", "confirm_title"), esp.lang("event/order_detail_upgrade_payment", "confirm_msg", dataTicket?.price_name, selectedTicket?.selected_ticket?.price_name_to), esp.lang("event/order_detail_upgrade_payment", "confirm_ok"), () => {
       let post = {
-        booking_id: dataTicket?.id,
+        booking_id: dataTicket?.booking_id,
         price_id_to: selectedTicket?.selected_ticket?.price_id_to,
         trx_id: trxId,
         payment_id: selectedPayment?.payment_id,
@@ -104,7 +104,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
     return (percent * amount) / 100
   }
 
-  let amount = Number(selectedTicket?.selected_ticket?.amount) * Number(dataTicket?.qty_upgrade)
+  let amount = Number(selectedTicket?.selected_ticket?.amount_difference) * Number(dataTicket?.qty_upgrade)
   let _tax = percentageCalculator(amount, dataTicket?.tax_event)
   let subtotalWithTax = amount + _tax
 
@@ -127,6 +127,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
     )
   }
 
+
   return (
     <View style={{ flex: 1, backgroundColor: '#fff' }}>
       <EventHeader title={esp.lang("event/order_detail_upgrade_payment", "header_title")} />
@@ -168,6 +169,7 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
 
         <BigbangPayment_list
           eventId={dataTicket?.event_id}
+          url_payment={dataTicket?.url_payment}
           onToggleCC={() => { scrollRef.current?.scrollToEnd({ animated: true }) }}
           order_type={14} // upgrade ticekt
           currency={selectedTicket?.selected_ticket?.currency}

package/event/order_item.tsx

@@ -34,7 +34,7 @@ export default function m(props: EventOrder_itemProps): any {
   return (
     <Pressable onPress={props.onPress} style={{ backgroundColor: '#fff', borderRadius: 5, overflow: 'hidden', width: LibStyle.width - 30, margin: 15, marginBottom: 0 }}>
       <View style={{ alignContent: 'center', borderBottomWidth: 1, borderBottomColor: textColor(item?.color), alignItems: 'center', justifyContent: 'center', backgroundColor: item?.color, padding: 10 }}>
-        <EventHtmltext allowFontScaling={false} numberOfLines={1} ellipsizeMode="tail" style={{ color: textColor(item?.color), alignSelf: 'center', textAlign: 'center', fontSize: 16, fontWeight: 'bold' }}> {item?.price_name}</EventHtmltext>
+        <EventHtmltext allowFontScaling={false} numberOfLines={2} ellipsizeMode="tail" style={{ color: textColor(item?.color), alignSelf: 'center', textAlign: 'center', fontSize: 16, fontWeight: 'bold' }}> {item?.price_name}</EventHtmltext>
       </View>
       <View style={{ padding: 10, backgroundColor: '#fff', flex: 1 }}>
         <Text allowFontScaling={false} style={applyStyle({ marginHorizontal: 15, fontSize: 14, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#4a4a4a" })}>{item?.event_name}</Text>

package/event/order_share_to.tsx

@@ -142,7 +142,7 @@ export default function m(props: EventOrder_share_toProps): any {
               dialogUser.current!.show()
             }
           }}
-          style={{ marginLeft: 25, marginRight: 25, marginTop: 18 }} />
+          style={{ marginLeft: 25, marginRight: 25, marginTop: 18, borderRadius: 5 }} />
         <TouchableOpacity onPress={() => {
           if (inputEmail.current!.getText() == '') {
             LibToastProperty.show(esp.lang("event/order_share_to", "msg_error_input_email"))

package/event/review.tsx

@@ -93,7 +93,7 @@ export default function m(props: EventReviewProps): any {
         renderItem={(item: any) => {
           let type = calculateProb(item?.config?.review)
           let args = {
-            url: "https://api.test.bbo.co.id/event_order_detail?id=" + item.id,
+            url: "event_order_detail?id=" + item.id,
             url_form: item.url_form + (item.url_detail.includes("?") ? "&" : "?") + 'type=' + type?.type,
             booking_id: item.id,
             type: type?.type,

package/event/seat.tsx

@@ -116,7 +116,7 @@ export default function m(props: EventSeatProps): any {
     let post = {
       event_id: dataTicket?.event_id,
       booking_id: booking_id,
-      price_id: dataTicket?.selected_ticket?.list?.price_id,
+      price_id: dataTicket?.selected_ticket?.list?.price_id || dataTicket?.selected_ticket?.price_id,
       ondate: dataTicket?.selected_ticket?.list?.ondate,
     }
     new LibCurl(url, post, (res, msg) => { // event_seat_shared
@@ -134,7 +134,7 @@ export default function m(props: EventSeatProps): any {
   function loadDataSize() {
     let post = {
       event_id: dataTicket?.event_id,
-      price_id: dataTicket?.selected_ticket?.list?.price_id,
+      price_id: dataTicket?.selected_ticket?.list?.price_id || dataTicket?.selected_ticket?.price_id,
       ondate: dataTicket?.selected_ticket?.list?.ondate,
     }
     new LibCurl("event_seat_meta", post, (res, msg) => { // event_seat
@@ -166,7 +166,7 @@ export default function m(props: EventSeatProps): any {
   function loadSeat(_url?: string) {
     let post = {
       event_id: dataTicket?.event_id,
-      price_id: dataTicket?.selected_ticket?.list?.price_id,
+      price_id: dataTicket?.selected_ticket?.list?.price_id || dataTicket?.selected_ticket?.price_id,
       ondate: dataTicket?.selected_ticket?.list?.ondate,
     }
     new LibCurl(_url ? _url : url, post, (res, msg) => { // event_seat
@@ -487,7 +487,7 @@ export default function m(props: EventSeatProps): any {
                     y: resultDataSize.seat_row,
                     url: url,
                     event_id: dataTicket?.event_id,
-                    price_id: dataTicket?.selected_ticket?.list?.price_id,
+                    price_id: dataTicket?.selected_ticket?.list?.price_id || dataTicket?.selected_ticket?.price_id,
                     ondate: dataTicket?.selected_ticket?.list?.ondate,
                   }, 345).then((item: any) => {
                     setResult(undefined)
@@ -569,7 +569,7 @@ export default function m(props: EventSeatProps): any {
                         }}
                         onScroll={scrollHandlerY}>
                         <View>
-                          {result?.list?.map(renderRow)}
+                          {result?.list?.map?.(renderRow)}
                         </View>
                       </Animated.ScrollView>
                     </Animated.ScrollView>

package/event/tms_idcard.tsx

@@ -12,7 +12,6 @@ import { LibObject } from 'esoftplay/cache/lib/object/import';
 import { LibPicture } from 'esoftplay/cache/lib/picture/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 { UserClass } from 'esoftplay/cache/user/class/import';
 import esp from 'esoftplay/esp';
 import useSafeState from 'esoftplay/state';
@@ -75,9 +74,7 @@ export default function m(props: EventTms_idcardProps): any {
   }, [])
 
   function entrance() {
-    let url = url_ticket_update + LibUtils.objectToUrlParam({
-      is_turnstile: 0,
-    })
+    let url = url_ticket_update
 
     let post = {
       "target-url": `https://api.${esp.config().domain}/gate_checkin`,

package/event/tms_in_hall_failed.tsx

@@ -83,7 +83,7 @@ export default function m(props: EventTms_in_hall_failedProps): any {
         tms_id: UserClass.state().get()?.id,
         scanned: LibUtils.moment().format('YYYY-MM-DD HH:mm:ss'),
       }
-      new LibCurl(url_ticket_update + "?is_turnstile=0", post,
+      new LibCurl(url_ticket_update, post,
         (res) => {
           doneEntrance += 1
           if (mustBeEntrance <= doneEntrance) {

package/event/tms_in_success.tsx

@@ -93,9 +93,7 @@ export default function m(props: EventTms_in_successProps): any {
   }
 
   function useTicket() {
-    let url = url_ticket_update + LibUtils.objectToUrlParam({
-      is_turnstile: 0,
-    })
+    let url = url_ticket_update
 
     let post = {
       "target-url": `https://api.${esp.config().domain}/gate_checkin`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay-event",
-  "version": "0.0.0-e",
+  "version": "0.0.0-f",
   "description": "event module on esoftplay framework",
   "main": "index.js",
   "scripts": {