esoftplay-event 0.0.2-x → 0.0.2-z

package/event/additional_new.tsx

@@ -1,8 +1,8 @@
 // withHooks
-import { ComponentMessage } from 'esoftplay/cache/component/message/import';
 import { EventButton } from 'esoftplay/cache/event/button/import';
 import { EventHeader } from 'esoftplay/cache/event/header/import';
 import { EventInput_rectangle } from 'esoftplay/cache/event/input_rectangle/import';
+import { EventMessage } from 'esoftplay/cache/event/message/import';
 import { LibCollaps } from 'esoftplay/cache/lib/collaps/import';
 import { LibCurl } from 'esoftplay/cache/lib/curl/import';
 import { LibDatepicker } from 'esoftplay/cache/lib/datepicker/import';
@@ -453,7 +453,7 @@ export default function m(props: EventAdditional_newProps): any {
                       {
                         form?.error &&
                         <>
-                          <ComponentMessage message={form?.message || "Gagal memuat data"}
+                          <EventMessage message={form?.message || "Gagal memuat data"}
                             children={
                               <EventButton label='Coba lagi' onPress={() => {
                                 setReload(reload + 1)()

package/event/dialog_custom.tsx

@@ -0,0 +1,67 @@
+// withHooks
+
+import { EventCountdown_timestamp } from 'esoftplay/cache/event/countdown_timestamp/import';
+import { LibIcon } from 'esoftplay/cache/lib/icon/import';
+import { LibStyle } from 'esoftplay/cache/lib/style/import';
+import esp from 'esoftplay/esp';
+import useSafeState from 'esoftplay/state';
+import React from 'react';
+import { Pressable, Text, View } from 'react-native';
+
+
+export interface EventDialog_customArgs {
+
+}
+export interface EventDialog_customProps {
+  icon: any,
+  msg: string,
+  color: any
+  showCountdown?: boolean
+  onPressCancel: () => void,
+  onPressOK: () => void
+}
+
+export default function m(props: EventDialog_customProps): any {
+  const expTimestamp = Date.now() + 1000 * 60
+  const [timer] = useSafeState<number>(expTimestamp)
+  const [show, setShow] = useSafeState<boolean>(props?.showCountdown || false)
+
+  return (
+    <View style={{}}>
+      <View style={{ marginTop: 16, marginHorizontal: 10 }} >
+        <View style={{ alignItems: 'center', justifyContent: 'center' }} >
+          {props.icon && <View style={{ marginBottom: 30 }} ><LibIcon name={props.icon} size={70} color={props.color} /></View>}
+          {props.msg && <Text allowFontScaling={false} style={{ fontFamily: "Arial", fontSize: 14, fontWeight: "normal", fontStyle: "normal", lineHeight: 19, letterSpacing: 0, textAlign: "center", color: "#4a4a4a" }}>{props.msg || ''}</Text>}
+        </View>
+      </View>
+      <View style={{ flexDirection: 'row', marginTop: 30, paddingHorizontal: 10 }} >
+        <Pressable onPress={props.onPressCancel} style={{ flex: 1, height: 40, alignItems: 'center', justifyContent: 'center' }} >
+          <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 15 }}>{esp.lang("event/randomseat", "back")}</Text>
+          {/* <LibTextstyle textStyle="body" text={esp.lang("event/randomseat", "back")} /> */}
+        </Pressable>
+        <Pressable onPress={() => {
+          if (!show) {
+            props?.onPressOK?.()
+            setShow(x => !x)
+          }
+        }} style={{ flex: 1, height: 40, backgroundColor: LibStyle.colorRed, opacity: show ? 0.8 : 1, borderRadius: 25, alignItems: 'center', justifyContent: 'center', flexDirection: "row" }} >
+          <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 15, color: '#fff' }}>{esp.lang("component/dialog_custom", "try_again")}</Text>
+
+          {
+            show &&
+            <>
+              <Text style={{ fontWeight: 'bold', fontSize: 15, color: '#fff' }}>{" ("}</Text>
+              <EventCountdown_timestamp
+                onExpired={() => {
+                  setShow(x => !x)
+                }}
+                expiredTimestamp={timer}
+                style={{ color: "#fff", fontWeight: 'bold' }} />
+              <Text style={{ fontWeight: 'bold', fontSize: 15, color: '#fff' }}>{")"}</Text>
+            </>
+          }
+        </Pressable>
+      </View>
+    </View>
+  )
+}

package/event/index.tsx

@@ -74,12 +74,18 @@ export function isLogin(isLogin: () => void, isLogout?: () => void): void {
 }
 
 const ticketState = useGlobalState<any>(undefined, { persistKey: 'bigbang_card_tiket_cache1', isUserData: true, inFile: true, loadOnInit: true })
-export const reload = useGlobalSubscriber()
-
 export function stateTicketCache(): useGlobalReturn<any> {
   return ticketState
 }
 
+const bookedAddons = useGlobalState<any>({}, { persistKey: 'event_detail_addons_booked2', isUserData: true, inFile: true, loadOnInit: true })
+export function stateBookedAddonsCache(): useGlobalReturn<any> {
+  return bookedAddons
+}
+
+export const reload = useGlobalSubscriber()
+
+
 const state = useGlobalState<any>(undefined, { persistKey: 'bigbang/event', inFile: true })
 
 export default function m(props: EventIndexProps): any {

package/event/loading_page.tsx

@@ -1,6 +1,6 @@
 // withHooks
 
-import { ComponentDialog_custom } from 'esoftplay/cache/component/dialog_custom/import';
+import { EventDialog_custom } from 'esoftplay/cache/event/dialog_custom/import';
 import { EventDistribution_lock } from 'esoftplay/cache/event/distribution_lock/import';
 import { EventHeader } from 'esoftplay/cache/event/header/import';
 import { EventPayment_subscribeProperty } from 'esoftplay/cache/event/payment_subscribe/import';
@@ -120,7 +120,7 @@ export default function m(props: EventLoading_pageProps): any {
       // )
     } else if (error?.status_code == "PY0254") {
       LibDialog.custom(
-        <ComponentDialog_custom
+        <EventDialog_custom
           showCountdown
           icon={"close-circle"}
           color={LibStyle.colorRed}

package/event/order_detail.tsx

@@ -36,7 +36,6 @@ import { LibObject } from 'esoftplay/cache/lib/object/import';
 import { LibSlidingup } from 'esoftplay/cache/lib/slidingup/import';
 import { UseCondition } from 'esoftplay/cache/use/condition/import';
 import esp from 'esoftplay/esp';
-import useGlobalState from 'esoftplay/global';
 import moment from 'esoftplay/moment';
 import useSafeState from 'esoftplay/state';
 import useGlobalSubscriber, { useGlobalSubscriberReturn } from 'esoftplay/subscribe';
@@ -55,8 +54,6 @@ export function subscribe(): useGlobalSubscriberReturn {
   return subs
 }
 
-const bookedAddons = useGlobalState<any>(undefined, { persistKey: 'event_detail_addons_booked', isUserData: true, inFile: true, loadOnInit: true })
-
 export default function m(props: EventOrder_detailProps): any {
   const LibCurl = esp.mod("lib/curl")
 
@@ -71,6 +68,8 @@ export default function m(props: EventOrder_detailProps): any {
 
   const [, setGroupAddon, getGroupAddon] = useSafeState()
   const [, setSelectedAddon, getSelectedAddon] = useSafeState()
+  const [addonsCacheBooked, setAddOnsCacheBooked] = EventIndexProperty?.stateBookedAddonsCache()?.useState()
+  const [addonsBooked, setAddOnsBooked] = useSafeState(addonsCacheBooked[result?.id])
   const [errorAddonsBooked, setErrorddOnsBooked] = useSafeState()
 
   const dataOfflineReview = EventReview_addProperty.state().get()
@@ -98,10 +97,8 @@ export default function m(props: EventOrder_detailProps): any {
         sendReview(availableOfflineReview[0])
       }
 
-      if (res?.hasOwnProperty('url_addons_booked') && res?.url_addons_booked != "") {
-        loadDataAddonsBooked(res?.url_addons_booked)
-      }
-      // loadDataTicket(res?.id)
+      if (res?.url_addons_booked == "") return;
+      loadDataAddonsBooked(res?.url_addons_booked, res.id);
 
     }, (error: any) => {
       const transformedUrl = url?.includes("?id=") ? url?.replace(/\?id=/, '/') : url
@@ -157,15 +154,15 @@ export default function m(props: EventOrder_detailProps): any {
   }
 
 
-  function loadDataAddonsBooked(url: string) {
-    new LibCurl(url, null, (ress: any) => {
-      bookedAddons?.set(ress)
+  function loadDataAddonsBooked(url: string, bookingId: any) {
+    new LibCurl(url, null, (ress) => {
+      setAddOnsCacheBooked(LibObject.set(EventIndexProperty?.stateBookedAddonsCache().get(), ress)(bookingId))
+      setAddOnsBooked(ress)
       setErrorddOnsBooked(undefined)
-    }, (error: any) => {
-      bookedAddons?.set(undefined)
+    }, (error) => {
+      setAddOnsCacheBooked(LibObject.removeKeys(EventIndexProperty?.stateBookedAddonsCache().get(), bookingId)())
       setErrorddOnsBooked(error)
-    })
-
+    });
   }
 
   useEffect(() => {
@@ -432,7 +429,7 @@ export default function m(props: EventOrder_detailProps): any {
             </View>
             {
               result?.hasOwnProperty('url_addons_booked') && result?.url_addons_booked != "" &&
-              <EventOrder_detail_addons_booked addonsBooked={bookedAddons?.get()} errorAddonsBooked={errorAddonsBooked} onPress={loadData} />
+              <EventOrder_detail_addons_booked addonsBooked={addonsBooked} errorAddonsBooked={errorAddonsBooked} onPress={loadData} />
             }
           </View>
 

package/event/order_detail_addons_booked.tsx

@@ -27,7 +27,7 @@ export default function m(props: EventOrder_detail_addons_bookedProps): any {
               <View style={{ marginLeft: 10 }}>
                 <Text allowFontScaling={false} style={{ color: '#484848', fontSize: 14, fontWeight: 'bold', fontFamily: "Arial" }}>
                   {x.price_name}
-                  {x?.list?.length == 1 ? " (" + Number(x?.list?.[0]?.qty) + " Tiket)" : ""}
+                  {x?.list?.length == 1 && x?.list?.[0]?.ondate == "0000-00-00" ? " (" + Number(x?.list?.[0]?.qty) + " Tiket)" : ""}
                 </Text>
                 {
                   x?.list?.length > 0 && x?.list?.map((z: any, i: number) => {

package/event/point_redemption.tsx

@@ -73,8 +73,8 @@ export default function m(props: EventPoint_redemptionProps): any {
           </View>
           <EventButton style={{ margin: 10 }} label='Scan QR Member' backgroundColor='#001B3C' onPress={() => {
             LibNavigation.navigateForResult('component/scanner').then((value) => {
-              // LibNavigation.navigate('event/point_redemption_input', { qr: value })
-              LibNavigation.navigate('event/point_redemption_exchange', { qr: value })
+              LibNavigation.navigate('event/point_redemption_input', { qr: value })
+              // LibNavigation.navigate('event/point_redemption_exchange', { qr: value })
             })
           }} />
         </TouchableOpacity>

package/event/point_summary.tsx

@@ -25,7 +25,7 @@ export default function m(props: EventPoint_summaryProps): any {
             <LibIcon name='star-circle' size={150} color='#fff' />
           </View>
           <Text allowFontScaling={false} style={{ color: '#fff', fontFamily: LibFont('SFProText'), letterSpacing: 1, fontSize: 12 }}>{"POINT SAAT INI"}</Text>
-          <Text allowFontScaling={false} style={{ color: '#fff', fontFamily: LibFont('SFProText'), fontWeight: 'bold', fontSize: 36, letterSpacing: 1.5 }}>{"1000"}<Text style={{ fontSize: 14, fontWeight: 'normal' }}>{" POINT"}</Text> </Text>
+          <Text allowFontScaling={false} style={{ color: '#fff', marginTop: 5, fontFamily: LibFont('DecoNumbers'), fontSize: 40, letterSpacing: 1.5 }}>{"1000"}<Text style={{ fontSize: 14, fontWeight: 'normal' }}>{" POINT"}</Text> </Text>
         </View>
 
         <View style={{ margin: 15, marginBottom: 0,backgroundColor:'#E1E3E4', borderWidth: 1, borderColor: '#C5C7C8', borderRadius: 10, padding: 10, flexDirection: 'row' }}>

package/package.json

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