esoftplay-event 0.0.2-r → 0.0.2-t

package/event/order_detail.tsx

@@ -195,7 +195,6 @@ export default function m(props: EventOrder_detailProps): any {
           checked: 0,
         })
       })
-      esp.log({ data });
       setDataTicket(data)
       LibUtils.debounce(() => { dialogQtyAddons?.current?.show() }, 100)
     }, (error: any) => {
@@ -454,6 +453,7 @@ export default function m(props: EventOrder_detailProps): any {
 
   let startEvent = result?.start_date + " " + result?.start_time
   let dateNow = LibUtils.moment().localeFormat("YYYY-MM-DD HH:mm")
+  let valid = dataTicket?.some((item: any) => item.status == 1 && item.checked == 1);
 
   return (
     <View style={{ flex: 1, backgroundColor: LibStyle.colorBgGrey }}>
@@ -722,10 +722,8 @@ export default function m(props: EventOrder_detailProps): any {
                                 onPress={() => {
                                   setGroupAddon(item)
                                   LibUtils.debounce(() => {
-                                    // setQty(1)
                                     dialogAddonList?.current?.show()
                                   }, 100)
-                                  // loadDataAddons(item?.addons_id, item?.url)
                                 }}
                                 icon={'chevron-down'}
                                 title={item.title}
@@ -741,11 +739,9 @@ export default function m(props: EventOrder_detailProps): any {
                                 color={result?.color}
                                 onPress={() => {
                                   if (item?.hasOwnProperty('status') && item?.status == 1) {
-                                    // setQty(1)
-                                    setSelectedAddon(item)
-                                    loadDataTicket(result?.id, item?.[0]?.price_id, item?.[0]?.ondate)
-
-                                    // loadDataAddons(item?.addons_id, item?.url)
+                                    setGroupAddon(item)
+                                    setSelectedAddon(item?.list?.[0])
+                                    loadDataTicket(result?.id, item?.list?.[0]?.price_id, item?.list?.[0]?.ondate)
                                   }
                                 }}
                                 icon={'plus-circle-outline'}
@@ -1113,12 +1109,7 @@ export default function m(props: EventOrder_detailProps): any {
           <EventButton label={Number(result.is_shareable) ? /*share_ticket*/esp.lang("event/order_detail", "share_ticket") : esp.lang("event/order_detail", "shared")} onPress={() => {
             if (Number(result.is_shareable)) {
               LibDialog.confirm(esp.lang("event/order_detail", "share_title"), esp.lang("event/order_detail", "share_msg", esp.appjson().expo.name), esp.lang("event/order_detail", "share_ok"), () => {
-
-                if (esp.isDebug("")) {
-                  LibNavigation.navigate('event/order_detail_share', { url: url })
-                } else {
-                  LibNavigation.navigate('event/order_share_to', { url: url })
-                }
+                LibNavigation.navigate('event/order_detail_share', { url: url })
               }, esp.lang("event/order_detail", "share_no"), () => {
 
               })
@@ -1132,11 +1123,7 @@ export default function m(props: EventOrder_detailProps): any {
         result?.par_id != 0 && result?.status == 1 && result?.qty_returnable > 0 &&
         <View style={{ padding: 5 }}>
           <EventButton label={esp.lang("event/order_detail", "return_ticket")} onPress={() => {
-            if (esp.isDebug("")) {
-              LibNavigation.navigate('event/order_detail_return', { url: url })
-            } else {
-              dialogSendBack?.current?.show()
-            }
+            LibNavigation.navigate('event/order_detail_return', { url: url })
           }} backgroundColor={LibStyle.colorGreen} />
         </View>
       }
@@ -1229,9 +1216,13 @@ export default function m(props: EventOrder_detailProps): any {
           </ScrollView>
 
           <EventButton label={esp.lang("event/order_detail", "next")} onPress={() => {
-            dialogQtyAddons?.current?.hide()
-            loadDataAddons(getSelectedAddon()?.addons_id, getSelectedAddon()?.url)
-          }} backgroundColor={"#FFF"} borderColor={LibStyle.colorGreen} fontColor={LibStyle.colorGreen} />
+            if (valid) {
+              dialogQtyAddons?.current?.hide()
+              loadDataAddons(getSelectedAddon()?.addons_id, getSelectedAddon()?.url)
+            }
+          }}
+            backgroundColor={!valid ? LibStyle.colorGrey : LibStyle.colorGreen}
+          />
         </View>
       </LibSlidingup>
 

package/event/order_detail_share.tsx

@@ -136,6 +136,7 @@ export default function m(props: EventOrder_detail_shareProps): any {
   }
 
   let checkNotUsed = dataTicket?.length > 0 && dataTicket?.filter((x: any) => x?.checked == 0)
+  let valid = dataTicket?.some((item: any) => item.checked == 1);
 
   return (
     <LibKeyboard_avoid style={{ flex: 1, backgroundColor: '#fff' }}>
@@ -284,13 +285,15 @@ export default function m(props: EventOrder_detail_shareProps): any {
           <EventButton
             label={esp.lang("event/order_detail_share", "share_ticket")}
             onPress={() => {
-              LibNavigation.navigateForResult("bigbang/payment_pin", undefined, 1132).then((p) => {
-                if (p) {
-                  shareTicket(p)
-                }
-              })
+              if (valid) {
+                LibNavigation.navigateForResult("bigbang/payment_pin", undefined, 1132).then((p) => {
+                  if (p) {
+                    shareTicket(p)
+                  }
+                })
+              }
             }}
-            backgroundColor={LibStyle.colorPrimary}
+            backgroundColor={valid ? LibStyle.colorPrimary : LibStyle.colorBgGrey}
             style={{ borderRadius: 5, marginTop: 10 }}
           />
         </View>

package/package.json

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