esoftplay-event 0.0.0-u → 0.0.0-w

package/event/order.tsx

@@ -70,7 +70,7 @@ export function subscribe(): useGlobalSubscriberReturn {
 
 export default function m(props: EventOrderProps): any {
   const allStatus = EventOrder_status()
-  const statusCode = LibNavigation.getArgs(props, 'status', esp.isDebug("filter") ? '0,1,2,3,4,5' : '1')
+  const statusCode = LibNavigation.getArgs(props, 'status', esp.isDebug("filter") ? '0,1,2,3,4,5,6,7,10' : '1')
   const [status, setStatus] = useSafeState(statusCode)
   const [code, setCode] = useSafeState(statusCode)
   const [badge, setBadge] = useSafeState<number>(0)
@@ -238,9 +238,9 @@ export default function m(props: EventOrderProps): any {
             <LibTextstyle textStyle='footnote' text={esp.lang("event/order", "Transaction_Status")} style={applyStyle({ fontWeight: 'bold', fontSize: 14, color: "#4E4E4E" })} />
           </View>
           <ScrollView>
-            <Pressable onPress={() => { setCode('0,1,2,3,4,5') }} style={applyStyle({ flexDirection: 'row', alignItems: 'center', borderBottomWidth: 1, borderBottomColor: '#e6e6e6', paddingVertical: 12 })}>
+            <Pressable onPress={() => { setCode('0,1,2,3,4,5,6,7,10') }} style={applyStyle({ flexDirection: 'row', alignItems: 'center', borderBottomWidth: 1, borderBottomColor: '#e6e6e6', paddingVertical: 12 })}>
               <LibTextstyle textStyle='footnote' text={esp.lang("event/order", "All_Transaction_Status")} style={applyStyle({ flex: 1, fontWeight: 'bold', fontSize: 10, color: "#4E4E4E" })} />
-              <LibIcon.Ionicons name={code == '0,1,2,3,4,5' ? 'radio-button-on' : 'radio-button-off'} color={code == '0,1,2,3,4,5' ? LibStyle.colorPrimary : '#4E4E4E'} />
+              <LibIcon.Ionicons name={code == '0,1,2,3,4,5,6,7,10' ? 'radio-button-on' : 'radio-button-off'} color={code == '0,1,2,3,4,5,6,7,10' ? LibStyle.colorPrimary : '#4E4E4E'} />
             </Pressable>
             {
               allStatus?.filter((item: any) => item.publish == 1).map((it: any, i: number) => {

package/event/order_detail_waiting.tsx

@@ -53,9 +53,9 @@ export default function m(props: EventOrder_waitingProps): any {
   useEffect(() => {
     loadData()
     stateData.reset()
-    // LibAutoreload.set(() => {
-    //   loadData()
-    // }, 6000)
+    LibAutoreload.set(() => {
+      loadData()
+    }, 6000)
     return () => LibAutoreload.clear()
   }, [])
 
@@ -445,14 +445,16 @@ export default function m(props: EventOrder_waitingProps): any {
 
           <View style={{ height: 3, backgroundColor: "#f6f6f6" }} />
           <Text allowFontScaling={false} style={{ fontSize: 10, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#9b9b9b", marginTop: 14 }}>{esp.lang("event/order_detail", "Checked_within_10_minutes_after_payment_is_made")}</Text>
-          <TouchableOpacity onPress={() => {
-            LibNavigation.navigate('event/order_detail_payment', {
-              data: result?.payment?.description
-            })
-          }}>
-            <Text allowFontScaling={false} style={{ fontSize: 10, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#16a085", marginTop: 7 }}>{esp.lang("event/order_detail", "payment_instruction")}</Text>
-          </TouchableOpacity>
-
+          {
+            result?.payment?.description != null &&
+            <TouchableOpacity onPress={() => {
+              LibNavigation.navigate('event/order_detail_payment', {
+                data: result?.payment?.description
+              })
+            }}>
+              <Text allowFontScaling={false} style={{ fontSize: 10, fontWeight: "normal", fontStyle: "normal", letterSpacing: 0, color: "#16a085", marginTop: 7 }}>{esp.lang("event/order_detail", "payment_instruction")}</Text>
+            </TouchableOpacity>
+          }
 
         </View>
       </LibScroll>

package/event/order_status.tsx

@@ -42,7 +42,7 @@ export default function m(): EventOrder_status[] {
       publish: 1
     },
     {
-      code: '2,4,10',
+      code: '2,4',
       text: esp.lang("event/order_status", "cancel"),
       module: 'event/order',
       icon: 'icons/event/ic_notification_event_cancel.png',
@@ -61,6 +61,13 @@ export default function m(): EventOrder_status[] {
       module: 'event/review',
       icon: 'icons/event/ic_notification_event_done.png',
       publish: esp.isDebug("review") ? 1 : 0
+    },
+    {
+      code: '10',
+      text: esp.lang("event/order_status", "system_cancel"),
+      module: 'event/order',
+      icon: 'icons/event/ic_notification_event_cancel.png',
+      publish: 1
     }
   ]
 }

package/id.json

@@ -1168,11 +1168,12 @@
   },
   "event/order_status": {
     "already_paid": "Sudah Dibayar",
-    "cancel": "Batal",
-    "done": "Selesai",
-    "expired": "Pembayaran Expired",
+    "cancel": "Dibatalkan Member",
+    "done": "Sudah Dipakai",
+    "expired": "Pembayaran Kedaluawarsa",
     "refund": "Refund",
     "review": "Review",
+    "system_cancel": "Dibatalkan Sistem",
     "waiting_payment": "Menunggu Pembayaran"
   },
   "event/order_waiting": {

package/package.json

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