esoftplay-event 0.0.0-s → 0.0.0-u

package/event/additional.tsx

@@ -40,8 +40,16 @@ export default function m(props: EventAdditionalProps): any {
   }, [])
 
   function loadData() {
-    let url = 'event_booking_addition_form?event_id=' + event_id + "&price_id=" + price_id
+    let url = price_id
+      ? 'event_booking_addition_form?event_id=' + event_id + "&price_id=" + price_id
+      : 'event_booking_addition_form?event_id=' + event_id
+
     new LibCurl(url, null, (res, msg) => {
+      // langsung skip kalau confignya per event ada additionalnya dan di price_id tidak ada additionalnya
+      if (res?.additions?.length == 0) {
+        LibNavigation.sendBackResult("", LibNavigation.getResultKey(props))
+      }
+
       const a = res?.additions?.length > 0 && res?.additions?.map?.((item: any, i: number) => {
         return ({
           ...item,
@@ -58,9 +66,10 @@ export default function m(props: EventAdditionalProps): any {
       setDataAddPost(new Array(is_each).fill({}))
 
     }, (err) => {
+      esp.log({ err });
       LibToastProperty.show(err.message)
       LibNavigation.back()
-    })
+    }, 1)
   }
 
   function renderItem(item: any, i: number) {
@@ -121,7 +130,12 @@ export default function m(props: EventAdditionalProps): any {
 
   return (
     <View style={{ flex: 1, backgroundColor: LibStyle.colorBgGrey }}>
-      <EventHeader title={esp.lang("event/additional", "header_title")} subtitle={ondate && ondate != "0000-00-00" ? type_ticket + " " + LibUtils.moment(ondate).format("DD MMM YYYY") : type_ticket} />
+      <EventHeader title={esp.lang("event/additional", "header_title")} subtitle={
+        type_ticket ?
+          (ondate && ondate != "0000-00-00" ? type_ticket + " " + LibUtils.moment(ondate).format("DD MMM YYYY") : type_ticket)
+          :
+          ""
+      } />
       <ScrollView>
         <View style={{ margin: 15, marginBottom: 5, marginTop: 10, padding: 10, borderWidth: 1, borderColor: '#fff', borderRadius: 5, backgroundColor: '#fff', ...LibStyle.elevation(2) }}>
           <LibTextstyle textStyle='m_overline' text={esp.lang("event/additional", "buyer_info")} style={{ color: "#aaa", fontSize: 12, marginBottom: 5 }} />

package/event/detail.tsx

@@ -121,6 +121,8 @@ export default function m(props: EventDetailProps): any {
   const diffTime = startDate - currentDate;
   const diffDays = diffTime / (1000 * 60 * 60 * 24);
 
+  esp.log(result);
+
   return (
     <View style={{ flex: 1, backgroundColor: '#fff' }} >
       <EventHeader
@@ -286,6 +288,7 @@ export default function m(props: EventDetailProps): any {
                           LibNavigation.navigate(result?.config?.hasOwnProperty('multiprice') && result?.config?.multiprice == 1 ? 'event/ticket_list2' : 'event/ticket_list', {
                             url: result.url_price,
                             has_addition: result?.has_addition,
+                            has_addition_global: result?.has_addition_global,
                             fee_platform: {
                               fee_platform_amount: result?.fee_platform_amount,
                               fee_platform_type: result?.fee_platform_type,
@@ -301,6 +304,7 @@ export default function m(props: EventDetailProps): any {
                         LibNavigation.navigate(result?.config?.hasOwnProperty('multiprice') && result?.config?.multiprice == 1 ? 'event/ticket_list2' : 'event/ticket_list', {
                           url: result.url_price,
                           has_addition: result?.has_addition,
+                          has_addition_global: result?.has_addition_global,
                           fee_platform: {
                             fee_platform_amount: result?.fee_platform_amount,
                             fee_platform_type: result?.fee_platform_type,

package/event/loading_page.tsx

@@ -130,9 +130,10 @@ export default function m(props: EventLoading_pageProps): any {
           //   />
           // )
         } else {
-          LibDialog.warningConfirm(esp.lang("event/loading_page", "oops"), error?.message, esp.lang("event/loading_page", "back"), () => {
+          if (error?.status_code != "GE043")
+            LibDialog.warningConfirm(esp.lang("event/loading_page", "oops"), error?.message, esp.lang("event/loading_page", "back"), () => {
 
-          }, "", () => { })
+            }, "", () => { })
         }
       }, 1)
     } else {
@@ -182,9 +183,10 @@ export default function m(props: EventLoading_pageProps): any {
           //   />
           // )
         } else {
-          LibDialog.warningConfirm(esp.lang("event/loading_page", "oops"), error?.message, esp.lang("event/loading_page", "back"), () => {
+          if (error?.status_code != "GE043")
+            LibDialog.warningConfirm(esp.lang("event/loading_page", "oops"), error?.message, esp.lang("event/loading_page", "back"), () => {
 
-          }, "", () => { })
+            }, "", () => { })
         }
       }, 1)
     }

package/event/order_detail_waiting.tsx

@@ -118,16 +118,18 @@ export default function m(props: EventOrder_waitingProps): any {
     payment_id: result?.payment_id,
   }
 
-  function rebuy(dataCC: any) {
+  function rebuy(dataCC?: any) {
     if (result?.has_addition == 1) {
       dataPost.addition = getAddition()
     }
 
-    dataPost.card_id = dataCC?.card_id
-    dataPost.card_number = dataCC?.card_number
-    dataPost.card_cvv = dataCC?.card_cvv
-    dataPost.card_expiry_year = dataCC?.card_expiry_month
-    dataPost.card_expiry_month = dataCC?.expiry_month
+    if (!!dataCC) {
+      dataPost.card_id = dataCC?.card_id
+      dataPost.card_number = dataCC?.card_number
+      dataPost.card_cvv = dataCC?.card_cvv
+      dataPost.card_expiry_year = dataCC?.card_expiry_month
+      dataPost.card_expiry_month = dataCC?.expiry_month
+    }
 
     let url = 'event_booking/' + result?.event_id
     LibNavigation.navigateForResult('event/loading_page', {
@@ -136,6 +138,7 @@ export default function m(props: EventOrder_waitingProps): any {
       title: esp.lang("bigbang/payment", "title_buy_ticket", result?.event_name),
       isSecure: 1,
       amount: LibUtils.numberAbsolute(result?.total),
+      currency: result?.currency,
       receive_name: "BBO",
       receive_image: 'https://bbo.co.id/images/uploads/logo-bbo-tagline_1.png',
       send_name: result?.name,
@@ -187,7 +190,7 @@ export default function m(props: EventOrder_waitingProps): any {
 
     LibProgress.show(esp.lang("event/order_detail_waiting", "wait"))
     new LibCurl('event_order_waiting_pay', post, (res, msg) => {
-      if (dataCC) {
+      if (res?.url_web) {
         let forWebCC = {
           url: url,
           url_web: res?.url_web,
@@ -221,6 +224,33 @@ export default function m(props: EventOrder_waitingProps): any {
 
   }
 
+  function payWithCC(cc?: boolean) {
+    if (!!cc) {
+      LibNavigation.navigateForResult('component/payment_cc', {
+        amount: result?.total,
+        event_id: result?.event_id,
+        currency: result?.currency
+      }).then((value) => {
+        doBuy(value)
+      })
+    } else {
+      doBuy()
+    }
+
+    function doBuy(value?: any) {
+      LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
+        if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
+          pay(value)
+        } else {
+          rebuy(value)
+        }
+      }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
+
+      })
+    }
+
+  }
+
   if (!result) {
     return <LibLoading />
   }
@@ -317,7 +347,7 @@ export default function m(props: EventOrder_waitingProps): any {
               </View>
 
               <EventButton
-                label='Unduh'
+                label={esp.lang("event/order_detail_waiting", "download")}
                 style={{ margin: 10, marginHorizontal: 20 }}
                 backgroundColor={LibStyle.colorGreen}
                 onPress={() => {
@@ -351,7 +381,7 @@ export default function m(props: EventOrder_waitingProps): any {
           }
 
           {
-            result?.payment?.payment_type != 3 && result?.payment?.payment_type != 4 && result?.payment?.payment_type != 11 && result?.payment?.payment_type != 13 &&
+            result?.payment?.payment_type != 3 && result?.payment?.payment_type != 4 && result?.payment?.payment_type != 11 && result?.payment?.payment_type != 13 && result?.payment?.payment_type != 14 &&
             <>
               <View style={{ height: 3, backgroundColor: "#f6f6f6" }} />
 
@@ -430,7 +460,7 @@ export default function m(props: EventOrder_waitingProps): any {
         result?.status == 0 && LibUtils.moment(result?.exp_payment).serverFormat('YYYY-MM-DD HH:mm:ss') >= dateNow &&
         <View style={{ padding: 15, paddingTop: 10, paddingBottom: 10 }}>
           {
-            result?.payment?.payment_type == 3 && //khusus cc
+            (result?.payment?.payment_type == 3 || result?.payment?.payment_type == 14) && //khusus cc & FPX
             <TouchableOpacity onPress={() => {
               if (result?.hasOwnProperty("has_addition") && result?.has_addition == 1) {
                 LibNavigation.navigateForResult('event/additional', {
@@ -442,38 +472,10 @@ export default function m(props: EventOrder_waitingProps): any {
                   if (additions != "") {
                     setAddition(additions)
                   }
-                  LibNavigation.navigateForResult('component/payment_cc', {
-                    amount: result?.total,
-                    event_id: result?.event_id,
-                    currency: result?.currency
-                  }).then((value) => {
-                    LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
-                      if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
-                        pay(value)
-                      } else {
-                        rebuy(value)
-                      }
-                    }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
-
-                    })
-                  })
+                  payWithCC(result?.payment?.payment_type == 3)
                 })
               } else {
-                LibNavigation.navigateForResult('component/payment_cc', {
-                  amount: result?.total,
-                  event_id: result?.event_id,
-                  currency: result?.currency
-                }).then((value) => {
-                  LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
-                    if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
-                      pay(value)
-                    } else {
-                      rebuy(value)
-                    }
-                  }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
-
-                  })
-                })
+                payWithCC(result?.payment?.payment_type == 3)
               }
             }}>
               <View style={{ marginBottom: 10, height: 35, borderRadius: 17, backgroundColor: LibStyle.colorRed, justifyContent: 'center', alignItems: 'center', borderWidth: 1, borderColor: LibStyle.colorRed }} >

package/event/order_share_to.tsx

@@ -125,39 +125,39 @@ export default function m(props: EventOrder_share_toProps): any {
             setEmail(t)
           }}
           onSubmitEditing={() => {
-            if (inputEmail.current!.getText() == '') {
+            if (inputEmail.current?.getText() == '') {
               LibToastProperty.show(esp.lang("event/order_share_to", "msg_error_input_email"))
-              inputEmail.current!.blur()
+              inputEmail.current?.blur()
               return
             } else if (email === user.email) {
               LibDialog.warningConfirm(esp.lang("event/order_share_to", "title_alert_fault"), esp.lang("event/order_share_to", "msg_alert_cant_share_ticket_to_myself"), esp.lang("event/order_share_to", "btn_yes_alert_cant_share_ticket_to_myself"), () => {
                 setEmail("")
                 inputEmail.current?.setText("")
-                inputEmail.current!.focus()
+                inputEmail.current?.focus()
               }, "", () => {
 
               })
               return
             } else {
-              dialogUser.current!.show()
+              dialogUser.current?.show()
             }
           }}
           style={{ marginLeft: 25, marginRight: 25, marginTop: 18, borderRadius: 5 }} />
         <TouchableOpacity onPress={() => {
-          if (inputEmail.current!.getText() == '') {
+          if (inputEmail.current?.getText() == '') {
             LibToastProperty.show(esp.lang("event/order_share_to", "msg_error_input_email"))
-            inputEmail.current!.blur()
+            inputEmail.current?.blur()
             return
           } else if (email === user.email) {
             LibDialog.warningConfirm(esp.lang("event/order_share_to", "title_alert_fault"), esp.lang("event/order_share_to", "msg_alert_cant_share_ticket_to_myself"), esp.lang("event/order_share_to", "btn_yes_alert_cant_share_ticket_to_myself"), () => {
               setEmail("")
               inputEmail.current?.setText("")
-              inputEmail.current!.focus()
+              inputEmail.current?.focus()
             }, "", () => {
 
             })
           } else {
-            dialogUser.current!.show()
+            dialogUser.current?.show()
           }
         }} >
           <View style={{ marginBottom: 10, marginTop: 18, marginLeft: 25, marginRight: 25, height: 35, borderRadius: 17.5, backgroundColor: "#34a2ec", borderStyle: "solid", borderWidth: 0.5, borderColor: "#2980b9", alignItems: 'center', justifyContent: 'center' }} >
@@ -192,9 +192,9 @@ export default function m(props: EventOrder_share_toProps): any {
               } else {
                 shareTicket()
               }
-              dialogUser.current!.hide()
+              dialogUser.current?.hide()
             }} cancel={() => {
-              dialogUser.current!.hide()
+              dialogUser.current?.hide()
             }}
             view={
               <View style={{ flexDirection: 'row', marginTop: 20, marginBottom: 8, justifyContent: 'center', alignContent: 'center', alignItems: 'center' }}>

package/event/seat_map.tsx

@@ -240,7 +240,7 @@ export default function m(props: any) {
             </ScrollView>
           </View>
           <View style={{ height: 40, marginLeft: 20, marginRight: 20, backgroundColor: LibStyle.colorPrimary, marginBottom: 20, borderRadius: 2, justifyContent: 'center', alignItems: 'center' }} >
-            <Text style={{ color: 'white', fontWeight: 'bold' }} >{stage || 'Depan'}</Text>
+            <Text style={{ color: 'white', fontWeight: 'bold' }} >{stage || esp.lang("event/seat_map", "front")}</Text>
           </View>
           <ScrollView horizontal showsHorizontalScrollIndicator >
             <EventTap onCoordinateGet={toggleSeat}>

package/event/ticket_list.tsx

@@ -134,7 +134,7 @@ export default function m(props: EventTicket_listProps): any {
 
   const [pendingData] = EventLoading_pageProperty.state().useState()
 
-  const { url, fee_platform, has_addition, subscribed }: any = useRef(LibNavigation.getArgsAll(props)).current
+  const { url, fee_platform, has_addition, has_addition_global, subscribed }: any = useRef(LibNavigation.getArgsAll(props)).current
 
   const [deeplinkParams] = UseDeeplinkProperty.params.useState()
   const [timer] = EventCountdownProperty.countdownTime.useState()

package/event/ticket_list2.tsx

@@ -135,7 +135,7 @@ export default function m(props: EventTicket_list2Props): any {
 
   const [pendingData] = EventLoading_pageProperty.state().useState()
 
-  const { has_addition, url, fee_platform, subscribed }: any = useRef(LibNavigation.getArgsAll(props)).current
+  const { has_addition, has_addition_global, url, fee_platform, subscribed }: any = useRef(LibNavigation.getArgsAll(props)).current
 
   const [deeplinkParams] = UseDeeplinkProperty.params.useState()
   const [timer] = EventCountdownProperty.countdownTime.useState()
@@ -147,6 +147,8 @@ export default function m(props: EventTicket_list2Props): any {
   const [showAll, setShowAll] = useSafeState<any>({});
   const [urlPayment, setUrlPayment] = useLazyState<any>()
 
+  // esp.log(availableResult);
+
   let dataEvent: any = {
     event_id: availableResult?.id,
     event_title: availableResult?.title,
@@ -205,9 +207,25 @@ export default function m(props: EventTicket_list2Props): any {
       });
     })
 
-    resetTicketAdditional()
-    ticketAdditional(transformedData)
-    setDataAddition([])
+
+    if (has_addition_global == 1) {
+      LibNavigation.navigateForResult('event/additional', {
+        event_id: dataEvent?.event_id,
+        qty: 1,
+      }, 696).then((value) => {
+        if (value != "") {
+          setDataAddition(dataAddition.push(JSON.parse(value)))
+        }
+        resetTicketAdditional()
+        ticketAdditional(transformedData)
+      })
+
+    } else {
+      resetTicketAdditional()
+      ticketAdditional(transformedData)
+      setDataAddition([])
+    }
+
   })
 
 
@@ -233,6 +251,9 @@ export default function m(props: EventTicket_list2Props): any {
     if (dataAddition?.length > 0) {
       dataEvent.addition = dataAddition
     }
+
+    esp.log(dataAddition);
+
     LibNavigation.navigate('payment/ticket_multi', {
       order_type: EventConfigProperty?.state()?.get()?.order_type?.ticket,
       fee_platform: fee_platform,

package/id.json

@@ -1043,6 +1043,7 @@
     "buy_now": "Bayar Sekarang",
     "canceled": "Order Cancelled",
     "choose_card": "Silahkan pilih kartu anda dahulu",
+    "download": "Unduh",
     "err": "Oops",
     "err_confirm": "Oops",
     "expired_on": "Berlaku hingga : ",
@@ -1320,6 +1321,7 @@
     "chosen": "Dipilih",
     "chosen_by": "Sedang dipilih orang lain",
     "empty": "Kosong",
+    "front": "Depan",
     "full": "Penuh",
     "header_title": "Pilih Kursi",
     "load_failed": "Oops!!",

package/package.json

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