ordering-ui-react-native 0.12.85 → 0.12.86

package/package.json

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

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

@@ -46,7 +46,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
   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 showTextArea = ['reject', 'deliveryFailed', 'pickupFailed', 'notReady', 'forcePickUp', 'forceDelivery'].includes(action)
 
   const handleFocus = () => {
     viewRef?.current?.measure((x: any, y: any) => {
@@ -187,6 +187,14 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
       orderNotReady: {
         comment: comments,
         status: 14
+      },
+      forcePickUp: {
+        reasons: comments,
+        status: 9
+      },
+      forceDelivery: {
+        reasons: comments,
+        status: 11
       }
     };
 
@@ -205,6 +213,12 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
     if (actions && action === 'notReady') {
       bodyToSend = orderStatus[actions.notReady]
     }
+    if (actions && action === 'forcePickUp') {
+      bodyToSend = orderStatus[actions.forcePickUp]
+    }
+    if (actions && action === 'forceDelivery') {
+      bodyToSend = orderStatus[actions.forceDelivery]
+    }
 
     bodyToSend.id = orderId;
     handleUpdateOrder && handleUpdateOrder(bodyToSend.status, bodyToSend);

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

@@ -51,7 +51,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     orderTitle,
     appTitle,
     handleClickLogisticOrder,
-
+    forceUpdate
   } = props;
   const [, { showToast }] = useToast();
   const { order } = props.order
@@ -214,6 +214,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [messagesReadList]);
 
+  useEffect(() => {
+    forceUpdate && handleViewActionOrder && handleViewActionOrder(forceUpdate === 9 ? 'forcePickUp': 'forceDelivery')
+  },[forceUpdate])
+
   const styles = StyleSheet.create({
     btnPickUp: {
       borderWidth: 0,

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

@@ -8,6 +8,7 @@ const Wrapper = styled.View`
 `;
 const Inner = styled.TextInput`
   height: 100px;
+  padding: 5px 10px 5px 10px;
 `;
 
 interface Props {

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

@@ -370,7 +370,8 @@ export interface OrderDetailsParams {
   driverUpdateLocation?: any;
   setDriverUpdateLocation?: any;
   handleClickLogisticOrder?: (status: number, orderId: number) => void;
-  orderTitle?: any
+  orderTitle?: any;
+  forceUpdate?: number;
 }
 export interface ProductItemAccordionParams {
   isCartPending?: boolean;
@@ -529,6 +530,8 @@ interface actions {
   pickupFailed: string;
   deliveryFailed: string;
   notReady: string;
+  forcePickUp: string;
+  forceDelivery: string;
 }
 
 interface textTranslate {

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

@@ -229,7 +229,7 @@ export interface BusinessInformationParams {
 export interface BusinessReviewsParams {
 	businessState: { business: any, loading: boolean, error: null };
 	reviewsList: { reviews: any, loading: boolean, error: null };
-	handleChangeSearch: any;
+  handleChangeSearch?: any;
 }
 export interface SearchBarParams {
 	searchValue?: any;