esoftplay-event 0.0.2-u → 0.0.2-w

package/event/artist.tsx

@@ -39,6 +39,7 @@ export default function m(props: BigbangArtistProps): any {
 
     new LibCurl(url, null,
       (res) => {
+        esp.modProp("event/countdown").eventURI.set(url)
         esp.log({ res });
         new LibCurl(res?.[0]?.url_event || `event_detail/${res?.[0]?.event_id}`, null, (res) => {
           setResultEvent(res)

package/event/countdown.tsx

@@ -23,6 +23,8 @@ export const countdownTime = useGlobalState<any>('0')
 
 export const releaseQueue = useGlobalSubscriber()
 
+export const eventURI = useGlobalState<string>('')
+
 export default function m(props: EventCountdownProps): any {
   const [timer] = countdownTime.useState()
   const routes = UserRoutes.state().useSelector((x) => x?.routes)
@@ -36,6 +38,7 @@ export default function m(props: EventCountdownProps): any {
       doneQueue(pathQueue, event_id, key, () => { })
       EventQueue_pricingProperty.state().reset()
       countdownTime.reset()
+      eventURI.reset()
     }
   })
 
@@ -57,13 +60,14 @@ export default function m(props: EventCountdownProps): any {
         <EventCountdown_timestamp
           onExpired={() => {
             const routeNames = UserRoutes.state()?.get()?.routes?.map?.((x: any) => x.name)
-            if (routeNames.includes("event/artist"))
-              LibNavigation.navigate("event/artist")
-            else if (routeNames.includes("event/detail"))
-              LibNavigation.navigate("event/detail")
-            else
-              LibNavigation.backToRoot()
+            if (routeNames.includes("event/artist")) {
+              LibNavigation.navigate("event/artist", { url: eventURI.get() })
+            } else if (routeNames.includes("event/detail")) {
+              LibNavigation.navigate("event/detail", { url: eventURI.get() })
+            }
+            LibNavigation.backToRoot()
             countdownTime.reset()
+            eventURI.reset()
           }}
           expiredTimestamp={timer}
           style={{ color: "#fff" }} />

package/event/detail.tsx

@@ -41,6 +41,7 @@ export default function m(props: EventDetailProps): any {
   function loadData(): void {
     // CacheHit.doHit(url)
     new LibCurl(url, null, (res, msg) => {
+      esp.modProp("event/countdown").eventURI.set(url)
       EventFirebase_socketProperty.eventIdQueue.set(res.id)
       setResult(res)
       if (res.allotment) {

package/event/order_detail.tsx

@@ -154,6 +154,7 @@ export default function m(props: EventOrder_detailProps): any {
     }, 1)
   }
 
+
   function loadDataAddonsBooked(url: string) {
     new LibCurl(url, null, (ress: any) => {
       setAddOnsBooked(ress)
@@ -683,7 +684,11 @@ export default function m(props: EventOrder_detailProps): any {
       <LibSlidingup ref={dialogQtyAddons}>
         <View style={{ backgroundColor: 'white', maxHeight: LibStyle.height - (LibStyle.height / 3), borderTopRightRadius: 20, borderTopLeftRadius: 20, padding: 20 }}>
           <Text style={{ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", color: "#b7b7b7" }} >{esp.lang("event/order_detail", "addons")}</Text>
-          <Text style={{ fontFamily: "Arial", marginBottom: 10, fontSize: 16, fontWeight: "bold", color: "#4a4a4a" }} >{getSelectedAddon()?.title}</Text>
+          <Text style={{ fontFamily: "Arial", fontSize: 16, fontWeight: "bold", color: "#4a4a4a" }} >{getSelectedAddon()?.title}</Text>
+          {
+            getSelectedAddon()?.info != "" &&
+            <EventHtmltext style={{ fontFamily: "Arial", marginBottom: 10, fontSize: 12, marginLeft: 10, color: "#b7b7b7" }} >{getSelectedAddon()?.info}</EventHtmltext>
+          }
 
           <ScrollView>
             <Text allowFontScaling={false} style={{ marginVertical: 10, fontFamily: "Arial", fontSize: 16, fontWeight: "bold", fontStyle: "normal", letterSpacing: 1.5, color: "#000" }}>{esp.lang("event/order_detail_share", "chose_ticket")}</Text>
@@ -794,7 +799,7 @@ export default function m(props: EventOrder_detailProps): any {
                     icon={'plus-circle-outline'}
                     title={item?.title}
                     subtitle={item?.ondate != "0000-00-00" ? LibUtils.moment(item.ondate).format("DD MMM YYYY") : ''}
-                    info={item.hasOwnProperty("info") && item?.info}
+                    info={item?.info}
                   />
                 )
               })

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

@@ -2,7 +2,7 @@
 import { useMemo, useRef } from 'react';
 
 import { BigbangPayment_detail_ticket, BigbangPayment_detail_ticketProperty } from 'esoftplay/cache/bigbang/payment_detail_ticket/import';
-import { BigbangPayment_list } from "esoftplay/cache/bigbang/payment_list/import";
+import { BigbangPayment_list, BigbangPayment_listProperty } from "esoftplay/cache/bigbang/payment_list/import";
 import { EventButton } from "esoftplay/cache/event/button/import";
 import { EventHeader } from "esoftplay/cache/event/header/import";
 import { EventTransaction } from 'esoftplay/cache/event/transaction/import';
@@ -28,9 +28,10 @@ export interface EventOrder_detail_upgrade_paymentArgs {
 export interface EventOrder_detail_upgrade_paymentProps {
 
 }
+
 export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
   const { dataTicket, selectedTicket, fee_platform, fee_custom }: any = LibNavigation.getArgsAll(props)
-  const [selectedPayment, setSelectedPayment] = useSafeState<any>()
+  const [selectedPayment, setSelectedPayment] = BigbangPayment_listProperty.paymentState.useState()
   const [charge, setCharge] = useSafeState<any>(0)
   const [chargePercent, setChargePercent] = useSafeState<any>()
 
@@ -111,7 +112,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

@@ -14,6 +14,7 @@ import { LibPicture } from 'esoftplay/cache/lib/picture/import';
 import { LibProgress } from 'esoftplay/cache/lib/progress/import';
 import { LibStyle } from 'esoftplay/cache/lib/style/import';
 import { LibTextstyle } from 'esoftplay/cache/lib/textstyle/import';
+import { LibTheme } from 'esoftplay/cache/lib/theme/import';
 import { LibToastProperty } from 'esoftplay/cache/lib/toast/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
 import esp from 'esoftplay/esp';
@@ -22,7 +23,7 @@ import moment from 'esoftplay/moment';
 import useSafeState from 'esoftplay/state';
 
 import React, { useEffect } from 'react';
-import { Pressable, RefreshControl, ScrollView, Text, TouchableOpacity, View } from 'react-native';
+import { RefreshControl, ScrollView, Text, TouchableOpacity, View } from 'react-native';
 
 
 export interface EventOrder_rescheduleArgs {
@@ -108,7 +109,7 @@ export default function m(props: EventOrder_rescheduleProps): any {
         LibProgress.hide()
         LibNavigation.backToRoot()
         LibNavigation.navigate('event/order')
-        LibNavigation.navigate('event/order_detail', { url: res.url })
+        // LibNavigation.navigate('event/order_detail', { url: res.url })
       }, (error) => {
         LibProgress.hide()
         LibDialog.warning(esp.lang("event/order_reschedule", "process_er"), error?.message)
@@ -291,7 +292,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 +314,6 @@ export default function m(props: EventOrder_rescheduleProps): any {
     )
   }
 
-  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' }
@@ -333,9 +333,15 @@ export default function m(props: EventOrder_rescheduleProps): any {
               <LibTextstyle textStyle='caption1' text={esp.lang("event/order_reschedule", "chared", item.qty_shared)} style={{ color: 'orange' }} />
             }
             <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>
+            <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 14, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : LibTheme._colorTextSecondary() })}>{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>
+              <View style={{ flexDirection: 'row', marginTop: 4, alignContent: 'center', alignItems: 'center' }}>
+                <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 16, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: _selectTicket ? "#3ea4dc" : LibTheme._colorTextSecondary() })}>{LibUtils.money(item.total, item.currency)}</Text>
+                {
+                  item?.tax != "0" &&
+                  <Text allowFontScaling={false} style={{ marginLeft: 10, fontFamily: "Arial", fontSize: 12, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: LibTheme._colorTextTertiary() }}>{esp.lang("event/order_reschedule", "price+tax")}</Text>
+                }
+              </View>
               {
                 item.refund != "0.00" && item.refund != "100.00" &&
                 <Text allowFontScaling={false} style={styleID_12nkjf}>{LibUtils.money(item.price)}</Text>
@@ -362,16 +368,20 @@ export default function m(props: EventOrder_rescheduleProps): any {
       <EventHeader title={result?.global_refundable == 1 ? esp.lang("event/order_reschedule", "refund_rescedule") : esp.lang("event/order_reschedule", "rescedule")} />
       {
         result?.global_refundable == 1 &&
-        <View style={{ margin: 15, marginBottom: 0, flexDirection: 'row' }}>
+        <View style={{ margin: 15, padding: 3, borderRadius: 5, backgroundColor: '#fff', flexDirection: 'row' }}>
           {
             defaultTabs.map((item: any, i: number) => {
+              let active = item.id == activeTab
               return (
-                <Pressable onPress={() => {
-                  loadData()
-                  setActiveTab(item.id)()
-                }} key={i} style={{ flex: 1, padding: 10, borderTopLeftRadius: 10, borderTopRightRadius: 10, backgroundColor: item.id == activeTab ? "#fff" : LibStyle.colorBgGrey }}>
-                  <Text allowFontScaling={false} style={{ opacity: item.id == activeTab ? 1 : 0.7, alignSelf: 'center', textAlign: 'center', fontFamily: "Arial", fontWeight: item.id == activeTab ? "bold" : "normal", fontStyle: "normal", letterSpacing: 0, color: item.id == activeTab ? "#000" : "#aab0b7" }} >{item.title}</Text>
-                </Pressable>
+                <TouchableOpacity
+                  key={i}
+                  onPress={() => {
+                    loadData()
+                    setActiveTab(item.id)()
+                  }}
+                  style={{ borderRadius: 5, padding: 5, alignContent: 'center', alignItems: 'center', justifyContent: 'center', flex: 1, backgroundColor: active ? LibStyle.colorPrimary : '#fff', marginRight: 1, marginLeft: 1 }}>
+                  <Text allowFontScaling={false} style={{ fontSize: active ? 16 : 12, color: active ? "#fff" : "#000", fontWeight: active ? 'bold' : 'normal' }}>{item?.title}</Text>
+                </TouchableOpacity>
               )
             })
           }
@@ -381,8 +391,11 @@ export default function m(props: EventOrder_rescheduleProps): any {
       <ScrollView refreshControl={
         <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
       }>
-        <View style={{ marginTop: result?.global_refundable == 1 ? 0 : 10, margin: 15, borderTopLeftRadius: 0, borderTopRightRadius: 0, borderRadius: 10, backgroundColor: '#fff', paddingBottom: activeTab == 2 ? 10 : 0 }}>
-          <LibPicture source={{ uri: result?.image }} style={applyStyle({ borderTopLeftRadius: 0, borderTopRightRadius: 0, height: imgHeight, width: imgWidth, resizeMode: 'cover' })} />
+        <View style={{ marginTop: result?.global_refundable == 1 ? 0 : 10, margin: 15, borderRadius: 10, backgroundColor: '#fff', paddingBottom: activeTab == 2 ? 10 : 0 }}>
+          {
+            result?.image != "" &&
+            <LibPicture source={{ uri: result?.image }} style={applyStyle({ height: imgHeight, width: imgWidth, resizeMode: 'cover' })} />
+          }
 
           <View style={{ flexDirection: 'row', margin: 14, marginTop: 4, justifyContent: 'space-between' }}>
             <Text allowFontScaling={false} style={{ marginTop: 14, fontFamily: "Arial", fontSize: 20, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: "#484848" }}>{result?.title}</Text>
@@ -401,7 +414,7 @@ export default function m(props: EventOrder_rescheduleProps): any {
 
           {
             activeTab == 2 &&
-            <View style={{ padding: 14, backgroundColor: '#f1f2f3' }}>
+            <View style={{ padding: 14, marginTop: 10, backgroundColor: '#f1f2f3' }}>
               <Text style={{ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0 }} >{esp.lang("event/order_reschedule", "ready_ticket")}</Text>
             </View>
           }

package/id.json

@@ -1126,6 +1126,7 @@
     "no": "Tidak",
     "no_ticket_need_reschedule_or_refund": "Tidak ada Tiket yang perlu di Reschedule / Refund",
     "ok": "Ok",
+    "price+tax": "(harga + pajak)",
     "process_er": "Oops",
     "qty_left": "Tersisa %s Tiket",
     "ready_ticket": "Tiket yang Tersedia",

package/package.json

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