esoftplay-event 0.0.0-t → 0.0.0-u

package/event/order_detail_waiting.tsx

@@ -118,16 +118,18 @@ export default function m(props: EventOrder_waitingProps): any {
     payment_id: result?.payment_id,
   }
 
-  function rebuy(dataCC: any) {
+  function rebuy(dataCC?: any) {
     if (result?.has_addition == 1) {
       dataPost.addition = getAddition()
     }
 
-    dataPost.card_id = dataCC?.card_id
-    dataPost.card_number = dataCC?.card_number
-    dataPost.card_cvv = dataCC?.card_cvv
-    dataPost.card_expiry_year = dataCC?.card_expiry_month
-    dataPost.card_expiry_month = dataCC?.expiry_month
+    if (!!dataCC) {
+      dataPost.card_id = dataCC?.card_id
+      dataPost.card_number = dataCC?.card_number
+      dataPost.card_cvv = dataCC?.card_cvv
+      dataPost.card_expiry_year = dataCC?.card_expiry_month
+      dataPost.card_expiry_month = dataCC?.expiry_month
+    }
 
     let url = 'event_booking/' + result?.event_id
     LibNavigation.navigateForResult('event/loading_page', {
@@ -188,7 +190,7 @@ export default function m(props: EventOrder_waitingProps): any {
 
     LibProgress.show(esp.lang("event/order_detail_waiting", "wait"))
     new LibCurl('event_order_waiting_pay', post, (res, msg) => {
-      if (dataCC) {
+      if (res?.url_web) {
         let forWebCC = {
           url: url,
           url_web: res?.url_web,
@@ -222,6 +224,33 @@ export default function m(props: EventOrder_waitingProps): any {
 
   }
 
+  function payWithCC(cc?: boolean) {
+    if (!!cc) {
+      LibNavigation.navigateForResult('component/payment_cc', {
+        amount: result?.total,
+        event_id: result?.event_id,
+        currency: result?.currency
+      }).then((value) => {
+        doBuy(value)
+      })
+    } else {
+      doBuy()
+    }
+
+    function doBuy(value?: any) {
+      LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
+        if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
+          pay(value)
+        } else {
+          rebuy(value)
+        }
+      }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
+
+      })
+    }
+
+  }
+
   if (!result) {
     return <LibLoading />
   }
@@ -352,7 +381,7 @@ export default function m(props: EventOrder_waitingProps): any {
           }
 
           {
-            result?.payment?.payment_type != 3 && result?.payment?.payment_type != 4 && result?.payment?.payment_type != 11 && result?.payment?.payment_type != 13 &&
+            result?.payment?.payment_type != 3 && result?.payment?.payment_type != 4 && result?.payment?.payment_type != 11 && result?.payment?.payment_type != 13 && result?.payment?.payment_type != 14 &&
             <>
               <View style={{ height: 3, backgroundColor: "#f6f6f6" }} />
 
@@ -431,7 +460,7 @@ export default function m(props: EventOrder_waitingProps): any {
         result?.status == 0 && LibUtils.moment(result?.exp_payment).serverFormat('YYYY-MM-DD HH:mm:ss') >= dateNow &&
         <View style={{ padding: 15, paddingTop: 10, paddingBottom: 10 }}>
           {
-            result?.payment?.payment_type == 3 && //khusus cc
+            (result?.payment?.payment_type == 3 || result?.payment?.payment_type == 14) && //khusus cc & FPX
             <TouchableOpacity onPress={() => {
               if (result?.hasOwnProperty("has_addition") && result?.has_addition == 1) {
                 LibNavigation.navigateForResult('event/additional', {
@@ -443,38 +472,10 @@ export default function m(props: EventOrder_waitingProps): any {
                   if (additions != "") {
                     setAddition(additions)
                   }
-                  LibNavigation.navigateForResult('component/payment_cc', {
-                    amount: result?.total,
-                    event_id: result?.event_id,
-                    currency: result?.currency
-                  }).then((value) => {
-                    LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
-                      if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
-                        pay(value)
-                      } else {
-                        rebuy(value)
-                      }
-                    }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
-
-                    })
-                  })
+                  payWithCC(result?.payment?.payment_type == 3)
                 })
               } else {
-                LibNavigation.navigateForResult('component/payment_cc', {
-                  amount: result?.total,
-                  event_id: result?.event_id,
-                  currency: result?.currency
-                }).then((value) => {
-                  LibDialog.confirm(esp.lang("bigbang/payment", "dialog_title"), esp.lang("bigbang/payment", "dialog_msg"), esp.lang("bigbang/payment", "dialog_ok"), () => {
-                    if (result?.hasOwnProperty("url_pay") && result?.url_pay != "") {
-                      pay(value)
-                    } else {
-                      rebuy(value)
-                    }
-                  }, esp.lang("bigbang/payment", "dialog_cancel"), () => {
-
-                  })
-                })
+                payWithCC(result?.payment?.payment_type == 3)
               }
             }}>
               <View style={{ marginBottom: 10, height: 35, borderRadius: 17, backgroundColor: LibStyle.colorRed, justifyContent: 'center', alignItems: 'center', borderWidth: 1, borderColor: LibStyle.colorRed }} >

package/package.json

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