esoftplay-event 0.0.0-v → 0.0.0-x

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

@@ -265,52 +265,53 @@ export default function m(props: EventAdditional_inputProps): any {
           />
         </View>
 
-        <LibSlidingup ref={dialogDatePicker}>
-          <View style={{ backgroundColor: 'white', paddingBottom: 25, height: 230 }}>
-            <LibDatepicker
-              minDate={LibUtils.moment().add(-90, 'years').localeFormat('YYYY-MM-DD')}
-              maxDate={LibUtils.moment().localeFormat('YYYY-MM-DD')}
-              onDateChange={(dt) => {
-                let updateValue = LibObject.set(newData, [dt])('additions', getIdx(), 'value')
-                let updateDisplayValue = LibObject.set(updateValue, [LibUtils.moment(dt).localeFormat("DD MMMM YYYY")])('additions', getIdx(), 'display_value')
-                setNewData(updateDisplayValue)
-                dialogDatePicker.current?.hide()
-              }}
-              selectedDate={newData?.additions?.[getIdx()]?.value?.[0] || LibUtils.moment().localeFormat('YYYY-MM-DD')}
-            />
-          </View>
-        </LibSlidingup>
+      </LibKeyboard_avoid>
 
-        <LibSlidingup ref={dialogDropdown} >
-          <View style={{ width: 40, height: 3, borderRadius: 5, backgroundColor: "#fff", alignSelf: 'center', marginBottom: 10 }} />
-          <View style={{ maxHeight: LibStyle.height - (LibStyle.height / 5), backgroundColor: 'white', borderTopLeftRadius: 15, paddingHorizontal: 25, borderTopRightRadius: 15, padding: 10 }} >
-            <Pressable style={{ marginTop: 10, alignSelf: 'flex-end' }} onPress={() => dialogDropdown.current?.hide()}>
-              <LibIcon name='close' color={"#c9c9c9"} />
-            </Pressable>
-            <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 16, marginBottom: 15 }}>{dropdownData?.question}</Text>
+      <LibSlidingup ref={dialogDatePicker}>
+        <View style={{ backgroundColor: 'white', paddingBottom: 25, height: 230 }}>
+          <LibDatepicker
+            minDate={LibUtils.moment().add(-90, 'years').localeFormat('YYYY-MM-DD')}
+            maxDate={LibUtils.moment().localeFormat('YYYY-MM-DD')}
+            onDateChange={(dt) => {
+              let updateValue = LibObject.set(newData, [dt])('additions', getIdx(), 'value')
+              let updateDisplayValue = LibObject.set(updateValue, [LibUtils.moment(dt).localeFormat("DD MMMM YYYY")])('additions', getIdx(), 'display_value')
+              setNewData(updateDisplayValue)
+              dialogDatePicker.current?.hide()
+            }}
+            selectedDate={newData?.additions?.[getIdx()]?.value?.[0] || LibUtils.moment().localeFormat('YYYY-MM-DD')}
+          />
+        </View>
+      </LibSlidingup>
 
-            <ScrollView>
-              {
-                dropdownData?.options?.map((item: any, i: number) => {
-                  return (
-                    <Pressable onPress={() => {
-                      let updateValue = LibObject.set(newData, [item.id])('additions', getIdx(), 'value')
-                      let updateDisplayValue = LibObject.set(updateValue, [item.content])('additions', getIdx(), 'display_value')
-                      setNewData(updateDisplayValue)
-
-                      dialogDropdown.current?.hide()
-                    }} key={i} style={{ borderBottomWidth: 1, borderColor: '#c5c5c5', padding: 10, flexDirection: 'row', alignItems: "center" }}>
-                      <Text allowFontScaling={false} style={{ flex: 1, fontFamily: 'InterMedium', fontSize: 16, color: '#2C2B2D' }}>{item?.content}</Text>
-                    </Pressable>
-                  )
-                })
-              }
+      <LibSlidingup ref={dialogDropdown} >
+        <View style={{ width: 40, height: 3, borderRadius: 5, backgroundColor: "#fff", alignSelf: 'center', marginBottom: 10 }} />
+        <View style={{ maxHeight: LibStyle.height - (LibStyle.height / 5), backgroundColor: 'white', borderTopLeftRadius: 15, paddingHorizontal: 25, borderTopRightRadius: 15, padding: 10 }} >
+          <Pressable style={{ marginTop: 10, alignSelf: 'flex-end' }} onPress={() => dialogDropdown.current?.hide()}>
+            <LibIcon name='close' color={"#c9c9c9"} />
+          </Pressable>
+          <Text allowFontScaling={false} style={{ fontWeight: 'bold', fontSize: 16, marginBottom: 15 }}>{dropdownData?.question}</Text>
 
-            </ScrollView>
+          <ScrollView>
+            {
+              dropdownData?.options?.map((item: any, i: number) => {
+                return (
+                  <Pressable onPress={() => {
+                    let updateValue = LibObject.set(newData, [item.id])('additions', getIdx(), 'value')
+                    let updateDisplayValue = LibObject.set(updateValue, [item.content])('additions', getIdx(), 'display_value')
+                    setNewData(updateDisplayValue)
+
+                    dialogDropdown.current?.hide()
+                  }} key={i} style={{ borderBottomWidth: 1, borderColor: '#c5c5c5', padding: 10, flexDirection: 'row', alignItems: "center" }}>
+                    <Text allowFontScaling={false} style={{ flex: 1, fontFamily: 'InterMedium', fontSize: 16, color: '#2C2B2D' }}>{item?.content}</Text>
+                  </Pressable>
+                )
+              })
+            }
 
-          </View>
-        </LibSlidingup>
-      </LibKeyboard_avoid>
+          </ScrollView>
+
+        </View>
+      </LibSlidingup>
     </View>
   )
 }

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

@@ -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-v",
+  "version": "0.0.0-x",
   "description": "event module on esoftplay framework",
   "main": "index.js",
   "scripts": {