ordering-ui-react-native 0.12.26 → 0.12.27

package/package.json

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

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

@@ -25,9 +25,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     closeModal,
     orderId,
     notShowCustomerPhone,
-    titleAccept,
-    titleReject,
-    titleNotReady,
+    orderTitle,
     appTitle,
   } = props;
 
@@ -45,7 +43,9 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   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)
+  const showTextArea = ['reject', 'deliveryFailed', 'pickupFailed', 'notReady'].includes(action)
   const handleFocus = () => {
     viewRef?.current?.measure((x: any, y: any) => {
       scrollViewRef?.current?.scrollTo({ x: 0, y });
@@ -112,7 +112,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       openTimerIOnput();
     }
 
-    if (actions && (action === 'reject' || action === 'failed' || action === 'notReady')) {
+    if (actions && showTextArea) {
       openTextTareaOInput();
     }
   }, []);
@@ -179,7 +179,11 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
         comment: comments,
         status: 6,
       },
-      failedByDriver: {
+      pickupFailedByDriver: {
+        comment: comments,
+        status: 10
+      },
+      deliveryFailedByDriver: {
         comment: comments,
         status: 12
       },
@@ -195,8 +199,11 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     if (actions && action === 'reject') {
       bodyToSend = orderStatus[actions.reject];
     }
-    if (actions && action === 'failed') {
-      bodyToSend = orderStatus[actions.failed]
+    if (actions && action === 'pickupFailed') {
+      bodyToSend = orderStatus[actions.pickupFailed]
+    }
+    if (actions && action === 'deliveryFailed') {
+      bodyToSend = orderStatus[actions.deliveryFailed]
     }
     if (actions && action === 'notReady') {
       bodyToSend = orderStatus[actions.notReady]
@@ -233,11 +240,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
             fontStyle: 'normal',
           }}
           weight="600">
-          {action === 'accept'
-            ? `${t(titleAccept?.key, titleAccept?.text)}:`
-            : action === 'notReady'
-              ? t(titleNotReady?.key, titleNotReady?.text)
-              : t(titleReject?.key, titleReject?.text)}
+          {titleOrder}
         </OText>
       </View>
       <Content showsVerticalScrollIndicator={false} ref={scrollViewRef}>
@@ -362,11 +365,11 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
           onEndEditing={handleFixTime}
         />
 
-        {(['failed', 'reject', 'notReady']?.includes(action)) && (
+        {showTextArea && (
           <Comments ref={viewRef}>
             <OTextarea
               textTareaRef={textTareaRef}
-              autoFocus={actions && (action === 'reject' || action === 'failed' || action === 'notReady')}
+              autoFocus
               onFocus={handleFocus}
               placeholder={t(
                 'PLEASE_TYPE_YOUR_COMMENTS_IN_HERE',
@@ -385,13 +388,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
           firstButtonClick={() => {
             handleAcceptOrReject();
           }}
-          btnText={
-            action === 'accept'
-              ? t('ACCEPT', 'Accept')
-              : action === 'notReady'
-                ? t('ORDER_NOT_READY', 'Order not ready')
-                : t('REJECT', 'Reject')
-          }
+          btnText={buttonText}
           color={action === 'accept' ? theme.colors.green : theme.colors.red}
           widthButton={'100%'}
         />

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

@@ -574,6 +574,7 @@ const LoginFormUI = (props: LoginParams) => {
                 forwardRef={inputRef}
                 onChange={(val: any) => onChange(val)}
                 returnKeyType="done"
+                onSubmitEditing={() => handleLogin()}
                 blurOnSubmit
               />
             )}

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

@@ -48,9 +48,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     updateDriverPosition,
     driverUpdateLocation,
     setDriverUpdateLocation,
-    titleAccept,
-    titleReject,
-    titleNotReady,
+    orderTitle,
     appTitle,
   } = props;
 
@@ -343,9 +341,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 orderId={order?.id}
                 notShowCustomerPhone
                 actions={actions}
-                titleAccept={titleAccept}
-                titleReject={titleReject}
-                titleNotReady={titleNotReady}
+                orderTitle={orderTitle}
                 appTitle={appTitle}
               />
             </OModal>
@@ -391,7 +387,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 handleChangeOrderStatus && handleChangeOrderStatus(9)
               }
               firstButtonClick={() =>
-                handleViewActionOrder && handleViewActionOrder('failed')
+                handleViewActionOrder && handleViewActionOrder('pickupFailed')
               }
               secondBtnText={t('PICKUP_COMPLETE', 'Pickup complete')}
               secondButton={true}
@@ -410,7 +406,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   handleChangeOrderStatus && handleChangeOrderStatus(11)
                 }
                 firstButtonClick={() =>
-                  handleViewActionOrder && handleViewActionOrder('failed')
+                  handleViewActionOrder && handleViewActionOrder('deliveryFailed')
                 }
                 secondBtnText={t('DELIVERY_COMPLETE', 'Delivery complete')}
                 secondButton={true}

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

@@ -42,10 +42,11 @@ export const OrdersOptionDate = (props: any) => {
         bgcolor={theme.colors.inputDisabled}
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_DATE', 'Select Date')}
-        dropViewMaxHeight={500}
+        dropViewMaxHeight={220}
         isCalendar
         rangeDate={search.date}
         handleChangeDate={handleChangeDate}
+        isCalendarAlwaysVisible
       />
     </Container>
   );

package/themes/business/src/components/shared/ODropDownCalendar.tsx

@@ -22,7 +22,8 @@ interface Props {
   textcolor?: string,
   isCalendar?: boolean,
   handleChangeDate?: any,
-  rangeDate?: any
+  rangeDate?: any,
+  isCalendarAlwaysVisible?: boolean
 }
 
 const Wrapper = styled.View`
@@ -94,7 +95,8 @@ const ODropDownCalendar = (props: Props) => {
     isModal,
     isCalendar,
     handleChangeDate,
-    rangeDate
+    rangeDate,
+    isCalendarAlwaysVisible
   } = props
 
   const theme = useTheme();
@@ -127,13 +129,13 @@ const ODropDownCalendar = (props: Props) => {
   }
 
   const customDayHeaderStylesCallback = () => {
-		return {
-			textStyle: {
-				color: theme.colors.unselectText,
-				fontSize: 12,
-			},
-		};
-	};
+    return {
+      textStyle: {
+        color: theme.colors.unselectText,
+        fontSize: 12,
+      },
+    };
+  };
 
   const calendarText = (from: any, to: any, placeholder: any) => {
     const end = ` ~ ${to}`
@@ -204,9 +206,9 @@ const ODropDownCalendar = (props: Props) => {
             </ScrollView>
           ) : (
             <CustomScrollView style={{
-              maxHeight: dropViewMaxHeight || null
+              maxHeight: dropViewMaxHeight || null,
             }}
-            nestedScrollEnabled={true}
+              nestedScrollEnabled={true}
             >
               {options.map((option: any, index: number) => (
                 <CustomTouchableOpacity
@@ -243,8 +245,8 @@ const ODropDownCalendar = (props: Props) => {
                     alignItems: 'center',
                     marginTop: 10
                   }}>
-                    <View style={{marginRight: 10, flex: 1, marginBottom: 15}}>
-                      <Text style={{marginBottom: 5}}>{t('FROM', 'From')}</Text>
+                    <View style={{ marginRight: 10, flex: 1, marginBottom: 15 }}>
+                      <Text style={{ marginBottom: 5 }}>{t('FROM', 'From')}</Text>
                       <DateInput
                         value={rangeDate.from}
                         placeholder={t('FROM', 'From')}
@@ -259,12 +261,12 @@ const ODropDownCalendar = (props: Props) => {
                         name='close'
                         color={theme.colors.disabled}
                         size={20}
-                        style={{position: 'absolute', bottom: 13, right: 10}}
+                        style={{ position: 'absolute', bottom: 13, right: 10 }}
                         onPress={() => handleChangeDate('', rangeDate.to)}
                       />
                     </View>
-                    <View style={{marginLeft: 10, flex: 1, marginBottom: 15}}>
-                      <Text style={{marginBottom: 5}}>{t('TO', 'To')}</Text>
+                    <View style={{ marginLeft: 10, flex: 1, marginBottom: 15 }}>
+                      <Text style={{ marginBottom: 5 }}>{t('TO', 'To')}</Text>
                       <DateInput
                         value={rangeDate.to}
                         placeholder={t('TO', 'To')}
@@ -279,13 +281,13 @@ const ODropDownCalendar = (props: Props) => {
                         name='close'
                         color={theme.colors.disabled}
                         size={20}
-                        style={{position: 'absolute', bottom: 13, right: 10}}
+                        style={{ position: 'absolute', bottom: 13, right: 10 }}
                         onPress={() => handleChangeDate(rangeDate.from, '')}
                       />
                     </View>
                   </View>
                   {
-                    defaultValue === 'calendar' && (
+                    (defaultValue === 'calendar' || isCalendarAlwaysVisible) && (
                       <CalendarPicker
                         previousComponent={
                           <FeatherIcon

package/themes/business/src/types/index.tsx

@@ -365,6 +365,7 @@ export interface OrderDetailsParams {
   updateDriverPosition?: any;
   driverUpdateLocation?: any;
   setDriverUpdateLocation?: any;
+  orderTitle?: any
 }
 export interface ProductItemAccordionParams {
   isCartPending?: boolean;
@@ -520,7 +521,8 @@ export interface TagsParams {
 interface actions {
   accept: string;
   reject: string;
-  failed: string;
+  pickupFailed: string;
+  deliveryFailed: string;
   notReady: string;
 }
 
@@ -542,6 +544,7 @@ export interface AcceptOrRejectOrderParams {
   titleReject?: textTranslate;
   titleNotReady?: textTranslate;
   appTitle?: textTranslate;
+  orderTitle?: any
 }
 
 export interface MapViewParams {