ordering-ui-react-native 0.23.91 → 0.23.93

package/package.json

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

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

@@ -38,7 +38,6 @@ import { OrderHeaderComponent } from './OrderHeaderComponent';
 import { OrderContentComponent } from './OrderContentComponent';
 import { _retrieveStoreData } from '../../providers/StoreUtil'
 import { usePrinterCommands } from './usePrinterCommands'
-import Alert from '../../../../../src/providers/AlertProvider'
 
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
@@ -78,7 +77,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [isDriverModalVisible, setIsDriverModalVisible] = useState(false);
   const [printerSettings, setPrinterSettings] = useState<any>('')
   const [autoPrintEnabled, setAutoPrintEnabled] = useState<boolean>(false)
-  const [alertState, setAlertState] = useState<any>({ open: false, title: '', content: [] })
 
   const orderToComplete = [4, 20, 21]
   const orderToReady = [7, 14]
@@ -317,11 +315,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     setUnreadAlert({ ...unreadAlert, business: false });
   };
 
-  const handleViewActionOrder = (action: string, options?: any) => {
+  const handleViewActionOrder = async (action: string, options?: any) => {
     if (openModalForMapView) {
       setOpenModalForMapView(false);
     }
-    if (options?.alert) {
+    if (options?.forceUpdateStatus) {
       let bodyToSend: any = {};
       const orderStatus: any = {
         acceptByBusiness: {
@@ -333,25 +331,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         bodyToSend = orderStatus[actions.accept];
       }
       bodyToSend.id = order?.id;
-      setAlertState({
-        open: true,
-        content: options?.content,
-        title: t('ORDER_STATUS', 'Order status'),
-        onAccept: async () => {
-          setAlertState({
-            open: false,
-            content: []
-          })
-          const order = await handleChangeOrderStatus(bodyToSend?.status, bodyToSend)
-          if (order?.id) {
-            setActionOrder(action);
-            setOpenModalForAccept(true);
-          } else {
-            showToast(ToastType.Error, t('FAILED_TO_UPDATE_ORDER', 'Failed to update order'), 5000)
-          }
-        }
-      })
-      return
+      const _order = await handleChangeOrderStatus(bodyToSend?.status, bodyToSend)
+      if (!_order?.id) {
+        showToast(ToastType.Error, t('FAILED_TO_UPDATE_ORDER', 'Failed to update order'), 5000)
+        return
+      }
     }
     setActionOrder(action);
     setOpenModalForAccept(true);
@@ -400,14 +384,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     navigation?.canGoBack() && navigation.goBack();
   };
 
-  const closeAlert = () => {
-    setAlertState({
-      open: false,
-      title: '',
-      content: []
-    })
-  }
-
   useEffect(() => {
     if (messagesReadList?.length) {
       openModalForBusiness
@@ -698,7 +674,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               <FloatingButton
                 btnText={t('REJECT', 'Reject')}
                 isSecondaryBtn={false}
-                secondButtonClick={() => handleViewActionOrder('accept', { alert: true, content: t('DO_YOU_WANT_ACCEPT_ORDER', 'Do you want to accept the order?') })}
+                secondButtonClick={() => handleViewActionOrder('accept', { forceUpdateStatus: true })}
                 firstButtonClick={() => handleViewActionOrder('reject')}
                 secondBtnText={t('ACCEPT', 'Accept')}
                 secondButton={true}
@@ -740,14 +716,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           )}
         </View>
       )}
-      <Alert
-        open={alertState.open}
-        content={alertState.content}
-        title={alertState.title || ''}
-        onAccept={alertState.onAccept}
-        onClose={closeAlert}
-        onCancel={closeAlert}
-      />
     </>
   );
 };

package/themes/original/src/components/BusinessController/index.tsx

@@ -40,6 +40,8 @@ function BusinessControllerPropsAreEqual(prevProps: any, nextProps: any) {
 		prevProps.isBusinessOpen === nextProps.isBusinessOpen
 }
 
+const deliveryTypes = [1, 7]
+
 export const BusinessControllerUI = React.memo((props: BusinessControllerParams) => {
 	const {
 		business,
@@ -321,14 +323,14 @@ export const BusinessControllerUI = React.memo((props: BusinessControllerParams)
 								</View>
 							) : (
 								<View style={styles.bullet}>
-									{orderState?.options?.type === 1 && !hideBusinessFee && (
+									{deliveryTypes.includes(orderState?.options?.type) && !hideBusinessFee && (
 										<OText size={textSize} color={theme.colors.textSecondary}>
 											{`${t('DELIVERY_FEE', 'Delivery fee')} ${parsePrice(businessDeliveryPrice ?? business?.delivery_price) + ' \u2022 '}`}
 										</OText>
 									)}
 									{!hideBusinessTime && (
 										<OText size={textSize} color={theme.colors.textSecondary}>{`${convertHoursToMinutes(
-											orderState?.options?.type === 1
+											deliveryTypes.includes(orderState?.options?.type)
 												? (businessDeliveryTime ?? business?.delivery_time)
 												: (businessPickupTime ?? business?.pickup_time),
 										)} \u2022 `}</OText>