ordering-ui-react-native 0.12.36 → 0.12.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.36",
+  "version": "0.12.37",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/AcceptOrRejectOrder/index.tsx

@@ -40,12 +40,14 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   const [time, setTime] = useState('');
   const [comments, setComments] = useState('');
   const [isKeyboardShow, setIsKeyboardShow] = useState(false);
-  const phoneNumber = customerCellphone;
-  let codeNumberPhone, numberPhone, numberToShow;
   const { top, bottom } = useSafeAreaInsets()
-  const titleOrder = t(orderTitle[action].key, orderTitle[action].text)
-  const buttonText = t(orderTitle[action].btnKey, orderTitle[action].btnText)
+
+  let codeNumberPhone, numberPhone, numberToShow;
+  const phoneNumber = customerCellphone;
+  const titleOrder = t(orderTitle[action]?.key, orderTitle[action]?.text)
+  const buttonText = t(orderTitle[action]?.btnKey, orderTitle[action]?.btnText)
   const showTextArea = ['reject', 'deliveryFailed', 'pickupFailed', 'notReady'].includes(action)
+
   const handleFocus = () => {
     viewRef?.current?.measure((x: any, y: any) => {
       scrollViewRef?.current?.scrollTo({ x: 0, y });
@@ -210,7 +212,6 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     }
 
     bodyToSend.id = orderId;
-
     handleUpdateOrder && handleUpdateOrder(bodyToSend.status, bodyToSend);
   };
 

package/themes/business/src/components/OrderDetails/Business.tsx

@@ -48,8 +48,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     isFromCheckout,
     driverLocation,
     actions,
-    titleAccept,
-    titleReject,
+    orderTitle,
     appTitle,
   } = props;
 
@@ -607,8 +606,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   orderId={order?.id}
                   notShowCustomerPhone={false}
                   actions={actions}
-                  titleAccept={titleAccept}
-                  titleReject={titleReject}
+                  orderTitle={orderTitle}
                   appTitle={appTitle}
                 />
               </OModal>

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -128,6 +128,36 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     setOpenModalForAccept(true);
   };
 
+  const handleCloseModal = () => {
+    setOpenModalForBusiness(false);
+  };
+
+  const handleArrowBack: any = () => {
+    navigation?.canGoBack() && navigation.goBack();
+  };
+
+  const handleRejectLogisticOrder = () => {
+    handleClickLogisticOrder?.(2, order?.logistic_order_id)
+    handleArrowBack()
+  }
+
+  const locations = [
+    {
+      ...order?.business?.location,
+      title: order?.business?.name,
+      icon: order?.business?.logo || theme.images.dummies.businessLogo,
+      type: 'Business',
+    },
+    {
+      ...order?.customer?.location,
+      title: order?.customer?.name,
+      icon:
+        order?.customer?.photo ||
+        'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
+      type: 'Customer',
+    },
+  ];
+
   useEffect(() => {
     if (permissions.locationStatus !== 'granted' && openModalForMapView) {
       setOpenModalForMapView(false);
@@ -146,20 +176,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     if (openModalForMapView) {
       setOpenModalForMapView(false);
     }
-  }, [order?.loading]);
-
-  const handleCloseModal = () => {
-    setOpenModalForBusiness(false);
-  };
-
-  const handleArrowBack: any = () => {
-    navigation?.canGoBack() && navigation.goBack();
-  };
-
-  const handleRejectLogisticOrder = () => {
-    handleClickLogisticOrder?.(2, order?.logistic_order_id)
-    handleArrowBack()
-  }
+  }, [props.order?.loading]);
 
   useEffect(() => {
     if (order?.driver === null && session?.user?.level === 4) {
@@ -176,23 +193,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [order?.driver]);
 
-  const locations = [
-    {
-      ...order?.business?.location,
-      title: order?.business?.name,
-      icon: order?.business?.logo || theme.images.dummies.businessLogo,
-      type: 'Business',
-    },
-    {
-      ...order?.customer?.location,
-      title: order?.customer?.name,
-      icon:
-        order?.customer?.photo ||
-        'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
-      type: 'Customer',
-    },
-  ];
-
   useEffect(() => {
     if (driverLocation) {
       locations[0] = driverLocation;
@@ -312,7 +312,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               handleUpdateOrder={handleChangeOrderStatus}
               closeModal={setOpenModalForAccept}
               customerCellphone={order?.customer?.cellphone}
-              loading={order?.loading}
+              loading={props.order?.loading}
               action={actionOrder}
               orderId={order?.id}
               notShowCustomerPhone
@@ -356,14 +356,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
         {showFloatButtonsPickUp[order?.status] && (
           <FloatingButton
-            disabled={order?.loading}
+            disabled={props.order?.loading}
             btnText={t('PICKUP_FAILED', 'Pickup failed')}
             isSecondaryBtn={false}
             secondButtonClick={() =>
               handleChangeOrderStatus && handleChangeOrderStatus(9)
             }
             firstButtonClick={() =>
-              handleViewActionOrder && handleViewActionOrder('failed')
+              handleViewActionOrder && handleViewActionOrder('pickupFailed')
             }
             secondBtnText={t('PICKUP_COMPLETE', 'Pickup complete')}
             secondButton={true}
@@ -375,14 +375,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         {(order?.status === 9 || order?.status === 19) && (
           <>
             <FloatingButton
-              disabled={order?.loading}
+              disabled={props.order?.loading}
               btnText={t('DELIVERY_FAILED', 'Delivery Failed')}
               isSecondaryBtn={false}
               secondButtonClick={() =>
                 handleChangeOrderStatus && handleChangeOrderStatus(11)
               }
               firstButtonClick={() =>
-                handleViewActionOrder && handleViewActionOrder('failed')
+                handleViewActionOrder && handleViewActionOrder('deliveryFailed')
               }
               secondBtnText={t('DELIVERY_COMPLETE', 'Delivery complete')}
               secondButton={true}
@@ -405,14 +405,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             widthButton={'45%'}
           />
         )}
-
-        <Alert
-          open={alertState.open}
-          onAccept={handleArrowBack}
-          onClose={handleArrowBack}
-          content={alertState.content}
-          title={t('WARNING', 'Warning')}
-        />
       </>
     )
   }
@@ -420,7 +412,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   return (
     <>
       {(!order || Object.keys(order).length === 0) &&
-        (order?.error?.length < 1 || !order?.error) && (
+        (props.order?.error?.length < 1 || !props.order?.error) && (
           <View style={{ flex: 1 }}>
             {[...Array(6)].map((item, i) => (
               <Placeholder key={i} Animation={Fade}>
@@ -437,7 +429,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </View>
         )}
 
-      {(!!order?.error || order?.error) && (
+      {(!!props.order?.error || props.order?.error) && (
         <NotFoundSource
           btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
           content={
@@ -457,7 +449,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           handleArrowBack={handleArrowBack}
           logisticOrderStatus={logisticOrderStatus}
         />
-        {order && Object.keys(order).length > 0 && (order?.error?.length < 1 || !order?.error) && (
+        {order && Object.keys(order).length > 0 && (props.order?.error?.length < 1 || !props.order?.error) && (
           <>
             {order?.order_group && order?.order_group_id ? order?.order_group?.orders.map((order: any) => (
               <OrderDetailsInformation order={order} />
@@ -467,6 +459,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </>
         )}
       </View>
+      {alertState?.open && (
+        <Alert
+          open={alertState.open}
+          onAccept={handleArrowBack}
+          onClose={handleArrowBack}
+          content={alertState.content}
+          title={t('WARNING', 'Warning')}
+        />
+      )}
     </>
   );
 };