esoftplay-event 0.0.1-k → 0.0.1-l

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/artist_detail.tsx

@@ -135,13 +135,11 @@ export default function m(props: EventArtist_detailProps): any {
           subscribed: subscribed
         })
       } else {
-        LibNavigation.navigateForResult('event/seat', {
+        LibNavigation.navigateForResult('event/seat_map_new', {
           url: 'event_seat',
           dataTicket: dataPost,
         }).then((value) => {
-          dataPost.row_id = value.row_id
-          dataPost.column_id = value.column_id
-          dataPost.seat_name = value.seat_name
+          dataPost.seat_label = value.seat_label
 
           if (data?.has_addition && data?.has_addition == 1) {
             LibNavigation.navigateForResult('event/additional', { type_ticket: selectedTicket?.type, ondate: selectedTicket?.list?.ondate, event_id: data?.event_id, qty: qty, data: dataPost }, 221).then((additions) => {

package/event/artist_detailv2.tsx

@@ -32,7 +32,7 @@ export default function m(props: EventArtist_detailv2Props): any {
     }, (err) => {
       LibToastProperty.show(err?.message)
       LibNavigation.back()
-    })
+    }, 1)
   }
 
   return (

package/event/button_order_detail.tsx

@@ -34,6 +34,7 @@ export default function m(props: EventButton_order_detailProps): any {
           }
         </LibGradient>
         <View style={{ flex: 1, margin: 3, borderRadius: 5, ...LibStyle.elevation(2), backgroundColor: props.color, justifyContent: 'center', alignContent: 'center', alignItems: 'center' }}>
+          {/* <LibIcon name={"dice-multiple"} size={40} color={EventOrder_itemProperty.textColor(props.color)} style={{ opacity: 1 }} /> */}
           <LibIcon name={props.icon} size={40} color={EventOrder_itemProperty.textColor(props.color)} style={{ opacity: 1 }} />
         </View>
       </View>

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_detail.tsx

@@ -510,13 +510,17 @@ export default function m(props: EventOrder_detailProps): any {
         />
 
         <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={esp.lang("event/order_detail", "join_lucky_draw")}
+            info={esp.lang("event/order_detail", "subtitle_lucky_draw")}
+          />
         </UseCondition>
 
         <UseCondition if={result?.is_luckydraw && result?.is_luckydraw == 2}>
@@ -552,8 +556,8 @@ export default function m(props: EventOrder_detailProps): any {
                   loadDataAddons(item?.addons_id, item?.url)
                 }}
                 icon={'plus-circle'}
-                title={item.title}
-                info={item.info}
+                title={"item.title"}
+                info={"item.info"}
               />
             )
           })

package/event/order_detail_upgrade.tsx

@@ -139,18 +139,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(esp.isDebug("") ? 'event/seat_map_new' : 'event/seat_map', {
+              LibNavigation.navigateForResult('event/seat_map_new', {
                 url: 'event_seat',
                 dataTicket: selectedTicket
               }).then((value) => {
                 let seatData: any = {}
-                if (esp.isDebug("")) {
-                  seatData.seat_label = value?.seat_label
-                } else {
-                  seatData.row_id = value?.row_id
-                  seatData.column_id = value?.column_id
-                  seatData.seat_name = value?.seat_name
-                }
+                seatData.seat_label = value?.seat_label
                 LibNavigation.navigate('event/order_detail_upgrade_payment', {
                   dataTicket: {
                     url_payment: result?.url_payment,

package/event/ticket_list.tsx

@@ -302,17 +302,11 @@ export default function m(props: EventTicket_listProps): any {
       if (selectedTicket?.config && selectedTicket?.config?.seat_autopick == 1) {
         checkAddition(dataPost)
       } else {
-        LibNavigation.navigateForResult(esp.isDebug("") ? 'event/seat_map_new' : 'event/seat_map', {
+        LibNavigation.navigateForResult('event/seat_map_new', {
           url: 'event_seat',
           dataTicket: dataPost,
         }).then((value) => {
-          if (esp.isDebug("")) {
-            dataPost.seat_label = value.seat_label
-          } else {
-            dataPost.row_id = value.row_id
-            dataPost.column_id = value.column_id
-            dataPost.seat_name = value.seat_name
-          }
+          dataPost.seat_label = value.seat_label
           checkAddition(dataPost)
         })
       }

package/event/ticket_list2.tsx

@@ -161,7 +161,7 @@ export default function m(props: EventTicket_list2Props): any {
   const [ticketSeat, resetTicketSeat] = taskSeat((item: any) => new Promise((next) => {
     if (item.use_seat == 1) {
       if (item.adjacent_seats == 0) {
-        LibNavigation.navigateForResult(esp.isDebug("") ? 'event/seat_map_new' : 'event/seat_map', {
+        LibNavigation.navigateForResult('event/seat_map_new', {
           url: 'event_seat',
           dataTicket: {
             ...dataEvent,

package/id.json

@@ -983,6 +983,7 @@
     "share_title": "Informasi",
     "shared": "Sudah dibagikan",
     "subtitle_addons": "Biar pengalamanmu makin lengkap",
+    "subtitle_lucky_draw": "Hadiah seru menantimu, buruan ikutan!",
     "success_copied": "Berhasil Disalin ",
     "thanks": "Thank you for your suggestion!!",
     "ticket": "TIKET ",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay-event",
-  "version": "0.0.1-k",
+  "version": "0.0.1-l",
   "description": "event module on esoftplay framework",
   "main": "index.js",
   "scripts": {