esoftplay-event 0.0.2-i → 0.0.2-j

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

@@ -174,10 +174,16 @@ export default function m(props: EventOrder_detail_upgrade_paymentProps): any {
 
     // Gov tax
     if (dataTicket?.tax_event) {
-      items.push({
-        label: esp.lang("bigbang/payment_detail", "tax", String(Number(dataTicket?.tax_event))),
-        value: LibUtils.money(calculate.tax, currency)
-      })
+      if (Number(dataTicket?.tax_event) !== 0) {
+        items.push({
+          label: esp.lang("bigbang/payment_detail", "tax", String(Number(dataTicket?.tax_event))),
+          value: LibUtils.money(calculate.tax, currency)
+        })
+      } else
+        //@ts-ignore
+        items.push({
+          caption: esp.lang("bigbang/payment_detail", "tax_include")
+        })
     }
 
     // Platform fee

package/event/scan_item.tsx

@@ -37,7 +37,7 @@ export default function m(props: EventScan_itemProps): any {
           <View style={applyStyle({ flexDirection: 'row', justifyContent: 'space-between', alignContent: 'center', alignItems: 'center' })}>
             <Text allowFontScaling={false} style={applyStyle({ color: props?.colorText ? props?.colorText : "#000", fontSize: 14 })}>{props.item.price_name}</Text>
             {
-              props.item.hasOwnProperty('seat_name') &&
+              props.item.hasOwnProperty('seat_name') && props?.item?.seat_name != "" &&
               <View style={applyStyle({ height: 35, width: 35, backgroundColor: "#fff", borderWidth: 1, borderColor: LibStyle.colorPrimary, borderRadius: 4, justifyContent: 'center', alignContent: 'center', alignItems: 'center' })}>
                 <LibIcon name="seat" color={LibStyle.colorPrimary} size={15} />
                 <Text allowFontScaling={false} style={applyStyle({ fontFamily: "Arial", fontSize: 12, fontWeight: "bold", fontStyle: "normal", letterSpacing: 0, color: LibStyle.colorPrimary })}>{props.item.seat_name}</Text>

package/event/tms_add_result.tsx

@@ -73,11 +73,16 @@ export default function m(props: EventTms_add_resultProps): any {
 
     new LibCurl('event_tms_access' + LibUtils.objectToUrlParam(post), null, (res, msg) => {
       if (is_add) {
-        const updatedPrice = res.price.map((item: any) => {
-          return { ...item, is_selected: "1" };
-        });
+        const updatedPrice = [...res.price]
+          .map((item: any) => {
+            return { ...item, is_selected: "1" }
+          })
+          .sort((a: any, b: any) =>
+            a.name.localeCompare(b.name, 'id', { sensitivity: 'base' })
+          )
+
+        const updatedData = { ...res, price: updatedPrice }
 
-        const updatedData = { ...res, price: updatedPrice }; // Menggabungkan kembali data dengan price yang telah diperbarui
         setTicketTypes(updatedData)
 
       } else {
@@ -139,7 +144,7 @@ export default function m(props: EventTms_add_resultProps): any {
 
         {
           ticketTypes &&
-          <View style={{ marginTop: 10 }}>
+          <View style={{ marginTop: 10, marginBottom: 10 }}>
             <LibTextstyle textStyle='m_overline' text={esp.lang("event/tms_add_result", "ticket_type")} style={{ fontSize: 12, marginTop: 15, marginBottom: 15 }} />
             {
               ticketTypes?.price?.map((item: any, i: number) => {

package/event/tms_in_hall_failed.tsx

@@ -183,7 +183,7 @@ export default function m(props: EventTms_in_hall_failedProps): any {
                     <View key={i} style={{ marginHorizontal: 10, marginBottom: 5, backgroundColor: "#fff", borderRadius: 10, overflow: 'hidden' }}>
                       {
                         item.hasOwnProperty("status_label") && item?.status_label != "" &&
-                        <View style={{ backgroundColor: '#37c2d0', padding: 10, }} >
+                        <View style={{ backgroundColor: item?.status_scanned == 1 ? '#37c2d0' : '#ffcb3dff', padding: 10, }} >
                           <Text allowFontScaling={false} style={{ fontSize: 16, fontWeight: "bold", fontStyle: "normal", letterSpacing: 1.5, color: item?.status == 1 ? item?.status_background : "#fff" }}>{(item?.status_label)?.toUpperCase()}</Text>
                         </View>
                       }

package/package.json

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